From b0649c1e4f42bc826dd84b0fae74e4c80846ccfe Mon Sep 17 00:00:00 2001
From: aj <aj@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Thu, 4 Nov 2004 19:14:58 +0000
Subject: [PATCH] =?UTF-8?q?build=20fixes=20by=20Vile=20Skytt=EF=BF=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1973 c6295689-39f2-0310-b995-f0e70906c6a9
---
 configure.in                  | 14 ++++++++------
 src/libopensc/Makefile.am     |  2 +-
 src/libopensc/libopensc.pc.in |  2 +-
 src/openscd/Makefile.am       |  2 +-
 src/pam/Makefile.am           |  2 +-
 src/pkcs15init/Makefile.am    |  4 ++--
 src/sia/Makefile.am           |  2 +-
 src/tests/Makefile.am         |  2 +-
 src/tools/Makefile.am         |  2 +-
 9 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 8c19570a..70b28b73 100644
--- a/configure.in
+++ b/configure.in
@@ -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=""
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index c8799650..2e5be3e0 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -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
 
diff --git a/src/libopensc/libopensc.pc.in b/src/libopensc/libopensc.pc.in
index c2baedd6..1f550f34 100644
--- a/src/libopensc/libopensc.pc.in
+++ b/src/libopensc/libopensc.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libopensc
 Description: libopensc
 Version: @VERSION@
-Libs: -L${libdir} -lopensc
+Libs: -L${libdir} -lopensc -lscconf
 Cflags: -I${includedir}
 
diff --git a/src/openscd/Makefile.am b/src/openscd/Makefile.am
index 135cfa3e..cdfb0c08 100644
--- a/src/openscd/Makefile.am
+++ b/src/openscd/Makefile.am
@@ -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
diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
index 7f3fd7f0..052f08fd 100644
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -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
diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am
index 3279be4c..5f134e82 100644
--- a/src/pkcs15init/Makefile.am
+++ b/src/pkcs15init/Makefile.am
@@ -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 \
diff --git a/src/sia/Makefile.am b/src/sia/Makefile.am
index 2e68e3cf..cc76dae0 100644
--- a/src/sia/Makefile.am
+++ b/src/sia/Makefile.am
@@ -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
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 03416c6f..c805c6be 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = . regression
 
 EXTRA_DIST = Makefile.mak
 
-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+AM_LDFLAGS = @LIBOPENSC@
 
 noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
 
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index d586f371..619b97df 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -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