From 2d32b17df6f408aac2dd500ac95295763d22c22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 12 May 2015 08:57:29 +0000
Subject: [PATCH] fixed build

---
 ChangeLog                   | 30 ++++++++++++++++++++++++++++++
 ax_init_standard_project.m4 |  8 ++++----
 bootstrap.sh                | 14 +++-----------
 src/makefile.am             |  4 ++--
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a32784a..70144d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2015-05-11 13:45  marc
+
+	* src/makefile.am: don't miss build of cert2text
+
+2015-05-09 22:35  marc
+
+	* ax_init_standard_project.m4: strange build error:
+	  'configure:18658: error: possibly undefined macro: m4_default'
+
+2015-05-09 16:51  marc
+
+	* ax_init_standard_project.m4, bootstrap.sh, src/libpcscxx.pc.in:
+	  corrected link command
+
+2015-05-09 09:33  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  src/libpcscxx.pc.in: fixed pkg-config requirements
+
+2015-05-08 23:38  marc
+
+	* ax_init_standard_project.m4, bootstrap.sh: fixed the mac bug
+	  again, because last change was incompatible with debian changelog
+	  format
+
+2015-05-08 23:12  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  configure.ac: build system fixed
+
 2015-05-07 14:37  marc
 
 	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 60f123d..e4ad10a 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -372,7 +372,7 @@ EOF
 # fails if not found
 AC_DEFUN([AX_PKG_REQUIRE], [
   PKG_PROG_PKG_CONFIG
-  PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
+  PKG_CHECK_MODULES([$1], [$2], [
     if test -n "$3"; then
       $1_found=0;
       for p in ${$1_CFLAGS}; do
@@ -400,12 +400,12 @@ AC_DEFUN([AX_PKG_REQUIRE], [
     AM_CXXFLAGS+=" ${$1_CFLAGS}"
     LIBS+=" ${$1_LIBS}"
     if test -z "$PKG_REQUIREMENTS"; then
-      PKG_REQUIREMENTS="m4_default([$2], [$1])"
+      PKG_REQUIREMENTS="$2"
     else
-      PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, m4_default([$2], [$1])"
+      PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, $2"
     fi
   ], [
-    AC_MSG_WARN([Recommended package m4_default([$2], [$1]) for feature $1 not installed])
+    AC_MSG_WARN([Recommended package $2 for feature $1 not installed])
     if test -n "$4"; then
       for pkg in $4; do
         PKG_CHECK_MODULES([$1], [$pkg], [
diff --git a/bootstrap.sh b/bootstrap.sh
index 82ab6df..77321db 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -233,10 +233,6 @@ HEADER='## @id '"\$Id\$"'
 
 '
 
-notice() {
-    echo -e "\e[1;33m$*\e[0m"
-}
-
 run() {
     check=1
     while test $# -gt 0; do
@@ -371,13 +367,9 @@ copy ${MY_NAME}
 copy ax_init_standard_project.m4
 copy ax_cxx_compile_stdcxx_11.m4
 copy ax_check_qt.m4
-AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
-if test -z "${AUTHOR}"; then
-    AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
-fi
-echo "$AUTHOR" | to AUTHORS && notice "please edit AUTHORS"
+copy AUTHORS
 to configure.ac <<EOF && \
-    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
+    ( echo "please edit configure.ac, then rerun $0"; exit 0 )
 ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
 m4_define(x_major, 0) # project's major version
 m4_define(x_minor, 0) # project's minor version
@@ -398,7 +390,7 @@ AX_INIT_STANDARD_PROJECT
 
 # qt features, uncomment, what you need:
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
-#AX_QT_NO_KEYWORDS
+#AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_KEYWORDS"
 
 # create output
 AC_OUTPUT
diff --git a/src/makefile.am b/src/makefile.am
index dbb8d54..771641a 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -45,12 +45,12 @@ endif
 bin_PROGRAMS =
 
 if HAVE_QTNETWORK
-bin_PROGRAMS += " cert2text"
+bin_PROGRAMS += cert2text
 cert2text_SOURCES = cert2text.cxx
 endif
 
 if HAVE_QTGUI
-bin_PROGRAMS += " cardgui"
+bin_PROGRAMS += cardgui
 cardgui_SOURCES = cardgui.cxx cardgui.hxx password.hxx cardgui-model.hxx \
                   cardgui.ui password.ui
 nodist_cardgui_SOURCES = ui_cardgui.hxx ui_password.hxx \