giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
aj 2004-11-04 19:14:58 +00:00
parent ca939d1dd6
commit b0649c1e4f
9 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@ -241,7 +241,7 @@ AC_SUBST(LIBCRYPTO)
AC_SUBST(ENGINE_LINK)
AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
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
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
],
[
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
]
)
@ -406,11 +406,13 @@ LIBS="$saved_LIBS"
if test "x$SSL_MSG" = "xyes" ; then
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
if test ! -z "$need_dash_r" ; then
if test "x$ac_cv_openssldir" != "x/usr"; then
LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
if test ! -z "$need_dash_r" ; then
LDFLAGS="-R$ac_cv_openssldir/lib $LDFLAGS"
fi
CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
fi
CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
else
LIBCRYPTO=""
LIBCRYPTOA=""

2
src/libopensc/Makefile.am
View File

@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak libopensc.pc.in
INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@
LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
AM_LDFLAGS = @OPENCT_LDFLAGS@
bin_SCRIPTS = opensc-config

2
src/libopensc/libopensc.pc.in
View File

@ -6,6 +6,6 @@ includedir=@includedir@
Name: libopensc
Description: libopensc
Version: @VERSION@
Libs: -L${libdir} -lopensc
Libs: -L${libdir} -lopensc -lscconf
Cflags: -I${includedir}

2
src/openscd/Makefile.am
View File

@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = test.c
INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LIBOPENSC@
if HAVE_ASSUAN
noinst_PROGRAMS = openscd

2
src/pam/Makefile.am
View File

@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
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
lib_LTLIBRARIES = pam_opensc.la

4
src/pkcs15init/Makefile.am
View File

@ -4,8 +4,8 @@ includedir = @includedir@/opensc
MAINTAINERCLEANFILES = Makefile.in
CFLAGS = @CFLAGS@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
AM_LDFLAGS = @LIBOPENSC@
PROFILES = \
cyberflex.profile \

2
src/sia/Makefile.am
View File

@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
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

2
src/tests/Makefile.am
View File

@ -6,7 +6,7 @@ SUBDIRS = . regression
EXTRA_DIST = Makefile.mak
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LIBOPENSC@
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest

2
src/tools/Makefile.am
View File

@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LIBOPENSC@
if HAVE_SSL
PROGRAMS_SSL = cryptoflex-tool pkcs15-init