[patch] --without-opensc fix

without-opensc.patch (text/plain), 2.23 KB, created by Stian Skjelstad on 2005-03-07 22:07:42 UTC

diff -ur openssh-3.9p1/configure openssh-3.9p1-without-opensc/configure
--- openssh-3.9p1/configure	2004-08-17 14:54:53.000000000 +0200
+++ openssh-3.9p1-without-opensc/configure	2005-03-08 07:05:47.013764760 +0100
@@ -20181,12 +20181,9 @@
 # Check whether --with-opensc or --without-opensc was given.
 if test "${with_opensc+set}" = set; then
   withval="$with_opensc"
-  opensc_config_prefix="$withval"
-else
-  opensc_config_prefix=""
-fi;
-if test x$opensc_config_prefix != x ; then
-  OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
+
+if test "x$withval" != xno ; then
+  OPENSC_CONFIG="$withval/bin/opensc-config"
   # Extract the first word of "opensc-config", so it can be a program name with args.
 set dummy opensc-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -20241,9 +20238,16 @@
 _ACEOF
 
     SCARD_MSG="yes, using OpenSC"
+  else
+   { { echo "$as_me:$LINENO: error: opensc-config not found" >&5
+echo "$as_me: error: opensc-config not found" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 fi
 
+
+fi;
+
 # Check libraries needed by DNS fingerprint support
 echo "$as_me:$LINENO: checking for library containing getrrsetbyname" >&5
 echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6
diff -ur openssh-3.9p1/configure.ac openssh-3.9p1-without-opensc/configure.ac
--- openssh-3.9p1/configure.ac	2004-08-16 15:12:06.000000000 +0200
+++ openssh-3.9p1-without-opensc/configure.ac	2005-03-08 07:05:39.419919200 +0100
@@ -2171,9 +2171,9 @@
 AC_ARG_WITH(opensc,
 	AC_HELP_STRING([--with-opensc=PFX],
 		       [Enable smartcard support using OpenSC]),
-	opensc_config_prefix="$withval", opensc_config_prefix="")
-if test x$opensc_config_prefix != x ; then
-  OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
+		       [
+if test "x$withval" != xno ; then
+  OPENSC_CONFIG="$withval/bin/opensc-config"
   AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
   if test "$OPENSC_CONFIG" != "no"; then
     LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
@@ -2183,8 +2183,12 @@
     AC_DEFINE(SMARTCARD)
     AC_DEFINE(USE_OPENSC)
     SCARD_MSG="yes, using OpenSC"
+  else
+   AC_MSG_ERROR([opensc-config not found])
   fi
 fi
+			]
+)
 
 # Check libraries needed by DNS fingerprint support
 AC_SEARCH_LIBS(getrrsetbyname, resolv,