libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

corrected link command

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-05-09 16:51:11 +00:00
parent 3686843431
commit 2b25a84c9a
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ax_init_standard_project.m4
View File

@@ -372,7 +372,7 @@ EOF
# fails if not found # fails if not found
AC_DEFUN([AX_PKG_REQUIRE], [ AC_DEFUN([AX_PKG_REQUIRE], [
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([$1], [$2], [ PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [
if test -n "$3"; then if test -n "$3"; then
$1_found=0; $1_found=0;
for p in ${$1_CFLAGS}; do for p in ${$1_CFLAGS}; do
@@ -400,12 +400,12 @@ AC_DEFUN([AX_PKG_REQUIRE], [
AM_CXXFLAGS+=" ${$1_CFLAGS}" AM_CXXFLAGS+=" ${$1_CFLAGS}"
LIBS+=" ${$1_LIBS}" LIBS+=" ${$1_LIBS}"
if test -z "$PKG_REQUIREMENTS"; then if test -z "$PKG_REQUIREMENTS"; then
PKG_REQUIREMENTS="$2" PKG_REQUIREMENTS="m4_default([$2], [$1])"
else else
PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, $2" PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, m4_default([$2], [$1])"
fi 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 if test -n "$4"; then
for pkg in $4; do for pkg in $4; do
PKG_CHECK_MODULES([$1], [$pkg], [ PKG_CHECK_MODULES([$1], [$pkg], [

12
bootstrap.sh
View File

@@ -233,6 +233,10 @@ HEADER='## @id '"\$Id\$"'
' '
notice() {
echo -e "\e[1;33m$*\e[0m"
}
run() { run() {
check=1 check=1
while test $# -gt 0; do while test $# -gt 0; do
@@ -367,9 +371,13 @@ copy ${MY_NAME}
copy ax_init_standard_project.m4 copy ax_init_standard_project.m4
copy ax_cxx_compile_stdcxx_11.m4 copy ax_cxx_compile_stdcxx_11.m4
copy ax_check_qt.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 && \ 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 ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
m4_define(x_major, 0) # project's major version m4_define(x_major, 0) # project's major version
m4_define(x_minor, 0) # project's minor version m4_define(x_minor, 0) # project's minor version

2
src/libpcscxx.pc.in
View File

@@ -14,6 +14,6 @@ includedir=${prefix}/include
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Description: @DESCRIPTION@ Description: @DESCRIPTION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -l@PACKAGE_NAME@ @LDFLAGS@ Libs: -L${libdir} -lpcscxx @LDFLAGS@
Cflags: -I${includedir} @CPPFLAGS@ Cflags: -I${includedir} @CPPFLAGS@
Requires: @PKG_REQUIREMENTS@ Requires: @PKG_REQUIREMENTS@