From 2b25a84c9a943142388a35eb008ea4493da56ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sat, 9 May 2015 16:51:11 +0000
Subject: [PATCH] corrected link command

---
 ax_init_standard_project.m4 |  8 ++++----
 bootstrap.sh                | 12 ++++++++++--
 src/libpcscxx.pc.in         |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index e4ad10a..1fa7db7 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], [$2], [
+  PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
     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="$2"
+      PKG_REQUIREMENTS="m4_default([$2], [$1])"
     else
-      PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, $2"
+      PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, m4_default([$2], [$1])"
     fi
   ], [
-    AC_MSG_WARN([Recommended package $2 for feature $1 not installed])
+    AC_MSG_WARN([Recommended package [m4_default([$2], [$1])] 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 1883611..82ab6df 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -233,6 +233,10 @@ HEADER='## @id '"\$Id\$"'
 
 '
 
+notice() {
+    echo -e "\e[1;33m$*\e[0m"
+}
+
 run() {
     check=1
     while test $# -gt 0; do
@@ -367,9 +371,13 @@ copy ${MY_NAME}
 copy ax_init_standard_project.m4
 copy ax_cxx_compile_stdcxx_11.m4
 copy ax_check_qt.m4
-copy AUTHORS
+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"
 to configure.ac <<EOF && \
-    ( echo "please edit configure.ac, then rerun $0"; exit 0 )
+    ( notice "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
diff --git a/src/libpcscxx.pc.in b/src/libpcscxx.pc.in
index 48ade93..04a5591 100644
--- a/src/libpcscxx.pc.in
+++ b/src/libpcscxx.pc.in
@@ -14,6 +14,6 @@ includedir=${prefix}/include
 Name: @PACKAGE_NAME@
 Description: @DESCRIPTION@
 Version: @VERSION@
-Libs: -L${libdir} -l@PACKAGE_NAME@ @LDFLAGS@
+Libs: -L${libdir} -lpcscxx @LDFLAGS@
 Cflags: -I${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@