linking needs crypto
This commit is contained in:
@@ -50,31 +50,40 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([AX_SUBST], [
|
||||
AC_SUBST([$1])
|
||||
tmp_var="${$1//$'\n'/\n}"
|
||||
AM_CPPFLAGS+=' -D$1='"'${tmp_var//#/\\#}'"
|
||||
AC_SUBST(AM_CPPFLAGS)
|
||||
])
|
||||
|
||||
AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
AC_SUBST(HOME)
|
||||
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X'"
|
||||
AX_SUBST(NUMBERS)
|
||||
AX_SUBST(HOME)
|
||||
README=$(tail -n +3 README)
|
||||
DESCRIPTION=$(head -1 README)
|
||||
AUTHOR=$(head -1 AUTHORS)
|
||||
AC_SUBST(AUTHOR)
|
||||
_AM_SUBST_NOTMAKE([AUTHOR])
|
||||
AC_SUBST(DESCRIPTION)
|
||||
_AM_SUBST_NOTMAKE([DESCRIPTION])
|
||||
AC_SUBST(README)
|
||||
AX_SUBST(README)
|
||||
_AM_SUBST_NOTMAKE([README])
|
||||
DESCRIPTION=$(head -1 README)
|
||||
AX_SUBST(DESCRIPTION)
|
||||
_AM_SUBST_NOTMAKE([DESCRIPTION])
|
||||
AUTHOR=$(head -1 AUTHORS)
|
||||
AX_SUBST(AUTHOR)
|
||||
_AM_SUBST_NOTMAKE([AUTHOR])
|
||||
DISTRO=$(lsb_release -sc)
|
||||
AC_SUBST(DISTRO)
|
||||
AX_SUBST(DISTRO)
|
||||
BUILD_NUMBER=${BUILD_NUMBER:-1}
|
||||
AC_SUBST(BUILD_NUMBER)
|
||||
AX_SUBST(BUILD_NUMBER)
|
||||
BUILD_DATE=$(date -R)
|
||||
AC_SUBST(BUILD_DATE)
|
||||
AX_SUBST(BUILD_DATE)
|
||||
if test -f "${PROJECT_NAME}-logo.png"; then
|
||||
PROJECT_LOGO="${PROJECT_NAME}-logo.png"
|
||||
fi
|
||||
AC_SUBST(PROJECT_LOGO)
|
||||
AX_SUBST(PROJECT_LOGO)
|
||||
if test -f "${PROJECT_NAME}-icon.png"; then
|
||||
PROJECT_ICON="${PROJECT_NAME}-icon.png"
|
||||
fi
|
||||
AC_SUBST(PROJECT_ICON)
|
||||
AX_SUBST(PROJECT_ICON)
|
||||
AC_CONFIG_FILES([makefile])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
|
||||
@@ -104,8 +113,8 @@ AC_DEFUN([AX_USE_CXX], [
|
||||
|
||||
AC_CONFIG_FILES([src/makefile])
|
||||
|
||||
AM_CPPFLAGS='-I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}'
|
||||
AM_LDFLAGS='-L ${top_srcdir}/src -L ${top_builddir}/src'
|
||||
AM_CPPFLAGS+=' -I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}'
|
||||
AM_LDFLAGS+=' -L ${top_srcdir}/src -L ${top_builddir}/src'
|
||||
|
||||
# Get rid of that stupid -O2 -g opions!
|
||||
CXXFLAGS="${CXXFLAGS:-}"
|
||||
|
@@ -6,6 +6,6 @@ includedir=${prefix}/include
|
||||
Name: @PACKAGE_NAME@
|
||||
Description: C++ wrappers around pcsc-lite, cryptoki, openssh
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lpcscxx @LDFLAGS@
|
||||
Libs: -L${libdir} -lpcscxx -lcrypto @LDFLAGS@
|
||||
Libs.private:
|
||||
Cflags: -I${includedir} @CPPFLAGS@
|
||||
|
Reference in New Issue
Block a user