build fixes by Vile Skytt�.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1973 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
ca939d1dd6
commit
b0649c1e4f
|
@ -241,7 +241,7 @@ AC_SUBST(LIBCRYPTO)
|
||||||
AC_SUBST(ENGINE_LINK)
|
AC_SUBST(ENGINE_LINK)
|
||||||
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
|
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
|
||||||
if test "x$tryssldir" = "x" ; then
|
if test "x$tryssldir" = "x" ; then
|
||||||
tryssldir="$trycommandir /usr/ /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl"
|
tryssldir="$trycommondir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for ssldir in $tryssldir ; do
|
for ssldir in $tryssldir ; do
|
||||||
|
@ -316,11 +316,11 @@ int main(void)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT("good, 0.9.7d or later")
|
AC_MSG_RESULT([good, 0.9.7d or later])
|
||||||
GOOD_OPENSSL=yes
|
GOOD_OPENSSL=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT("not so good, 0.9.7d or later woudl be better")
|
AC_MSG_RESULT([not so good, 0.9.7d or later would be better])
|
||||||
GOOD_OPENSSL=no
|
GOOD_OPENSSL=no
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
@ -406,11 +406,13 @@ LIBS="$saved_LIBS"
|
||||||
|
|
||||||
if test "x$SSL_MSG" = "xyes" ; then
|
if test "x$SSL_MSG" = "xyes" ; then
|
||||||
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
|
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
|
||||||
|
if test "x$ac_cv_openssldir" != "x/usr"; then
|
||||||
LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
|
LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
|
||||||
if test ! -z "$need_dash_r" ; then
|
if test ! -z "$need_dash_r" ; then
|
||||||
LDFLAGS="-R$ac_cv_openssldir/lib $LDFLAGS"
|
LDFLAGS="-R$ac_cv_openssldir/lib $LDFLAGS"
|
||||||
fi
|
fi
|
||||||
CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
|
CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
LIBCRYPTO=""
|
LIBCRYPTO=""
|
||||||
LIBCRYPTOA=""
|
LIBCRYPTOA=""
|
||||||
|
|
|
@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
EXTRA_DIST = Makefile.mak libopensc.pc.in
|
EXTRA_DIST = Makefile.mak libopensc.pc.in
|
||||||
|
|
||||||
INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@
|
INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
|
AM_LDFLAGS = @OPENCT_LDFLAGS@
|
||||||
|
|
||||||
bin_SCRIPTS = opensc-config
|
bin_SCRIPTS = opensc-config
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,6 @@ includedir=@includedir@
|
||||||
Name: libopensc
|
Name: libopensc
|
||||||
Description: libopensc
|
Description: libopensc
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -lopensc
|
Libs: -L${libdir} -lopensc -lscconf
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
EXTRA_DIST = test.c
|
EXTRA_DIST = test.c
|
||||||
|
|
||||||
INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
|
INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
AM_LDFLAGS = @LIBOPENSC@
|
||||||
|
|
||||||
if HAVE_ASSUAN
|
if HAVE_ASSUAN
|
||||||
noinst_PROGRAMS = openscd
|
noinst_PROGRAMS = openscd
|
||||||
|
|
|
@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
|
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
|
||||||
|
|
||||||
LDFLAGS = @LDFLAGS@ ${top_builddir}/src/scam/libscam.la
|
AM_LDFLAGS = ${top_builddir}/src/scam/libscam.la
|
||||||
|
|
||||||
if HAVE_PAM
|
if HAVE_PAM
|
||||||
lib_LTLIBRARIES = pam_opensc.la
|
lib_LTLIBRARIES = pam_opensc.la
|
||||||
|
|
|
@ -4,8 +4,8 @@ includedir = @includedir@/opensc
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
CFLAGS = @CFLAGS@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
|
AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
AM_LDFLAGS = @LIBOPENSC@
|
||||||
|
|
||||||
PROFILES = \
|
PROFILES = \
|
||||||
cyberflex.profile \
|
cyberflex.profile \
|
||||||
|
|
|
@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
|
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
|
||||||
|
|
||||||
LDFLAGS = @LDFLAGS@ @LIBDL@ ${top_builddir}/src/scam/libscam.la
|
AM_LDFLAGS = @LIBDL@ ${top_builddir}/src/scam/libscam.la
|
||||||
|
|
||||||
SRC = sia_opensc.c sia_support.c sia_support.h
|
SRC = sia_opensc.c sia_support.c sia_support.h
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ SUBDIRS = . regression
|
||||||
|
|
||||||
EXTRA_DIST = Makefile.mak
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
AM_LDFLAGS = @LIBOPENSC@
|
||||||
|
|
||||||
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
|
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
EXTRA_DIST = Makefile.mak
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
AM_LDFLAGS = @LIBOPENSC@
|
||||||
|
|
||||||
if HAVE_SSL
|
if HAVE_SSL
|
||||||
PROGRAMS_SSL = cryptoflex-tool pkcs15-init
|
PROGRAMS_SSL = cryptoflex-tool pkcs15-init
|
||||||
|
|
Loading…
Reference in New Issue