02_eap-sim_doesnt_need_openssl.dpatch

radius协议的经典实现

-    LIBS="-L$try -lcrypto $old_LIBS"
-    cat > conftest.$ac_ext <<EOF
-#line 1036 "configure"
-#include "confdefs.h"
-extern char DH_new();
-int main() {
- DH_new()
-; return 0; }
-EOF
-if { (eval echo configure:1043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  smart_lib="-L$try -lcrypto"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    if test "x$smart_lib" != "x"; then
-      break;
-    fi
-    LIBS="$old_LIBS"
-  done
-fi
-
-if test "x$smart_lib" != "x"; then
-  echo "$ac_t""yes" 1>&6
-  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-  LIBS="$smart_lib $old_LIBS"
-  SMART_LIBS="$smart_lib $SMART_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test "x$ac_cv_lib_crypto_DH_new" != "xyes"; then
- 	    fail="$fail libcrypto"
-    fi
-
-	
-
-sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
-sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:1076: checking for SSL_new in -lssl" >&5
-
-old_LIBS="$LIBS"
-smart_lib=
-smart_lib_dir=
-
-if test "x$smart_try_dir" != "x"; then
-  for try in $smart_try_dir; do
-    LIBS="-L$try -lssl $old_LIBS"
-    cat > conftest.$ac_ext <<EOF
-#line 1086 "configure"
-#include "confdefs.h"
-extern char SSL_new();
-int main() {
- SSL_new()
-; return 0; }
-EOF
-if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  smart_lib="-L$try -lssl"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    if test "x$smart_lib" != "x"; then
-      break;
-    fi
-    LIBS="$old_LIBS"
-  done
-fi
-
-if test "x$smart_lib" = "x"; then
-  LIBS="-lssl $old_LIBS"
-  cat > conftest.$ac_ext <<EOF
-#line 1111 "configure"
-#include "confdefs.h"
-extern char SSL_new();
-int main() {
- SSL_new()
-; return 0; }
-EOF
-if { (eval echo configure:1118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  smart_lib="-lssl"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-  LIBS="$old_LIBS"
-fi
-
-if test "x$smart_lib" = "x"; then
-  
-
-if test "x$LOCATE" != "x"; then
-        DIRS=
-  file=libssl${libltdl_cv_shlibext}
-
-  for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
-    if test "x$x" = "x$base"; then
-      continue;
-    fi
-
-    dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
-    if test "x$exclude" != "x"; then
-      continue
-    fi
-
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-    if test "x$already" = "x"; then
-      DIRS="$DIRS $dir"
-    fi
-  done
-fi
-
-eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-
-  
-
-if test "x$LOCATE" != "x"; then
-        DIRS=
-  file=libssl.a
-
-  for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
-    if test "x$x" = "x$base"; then
-      continue;
-    fi
-
-    dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
-    if test "x$exclude" != "x"; then
-      continue
-    fi
-
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-    if test "x$already" = "x"; then
-      DIRS="$DIRS $dir"
-    fi
-  done
-fi
-
-eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-
-
-  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
-    LIBS="-L$try -lssl $old_LIBS"
-    cat > conftest.$ac_ext <<EOF
-#line 1188 "configure"
-#include "confdefs.h"
-extern char SSL_new();
-int main() {
- SSL_new()
-; return 0; }
-EOF
-if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  smart_lib="-L$try -lssl"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    if test "x$smart_lib" != "x"; then
-      break;
-    fi
-    LIBS="$old_LIBS"
-  done
-fi
-
-if test "x$smart_lib" != "x"; then
-  echo "$ac_t""yes" 1>&6
-  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-  LIBS="$smart_lib $old_LIBS"
-  SMART_LIBS="$smart_lib $SMART_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test "x$ac_cv_lib_ssl_SSL_new" != "xyes"; then
- 	    fail="$fail libssl"
-    fi
-
-	echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1224: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1239 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1256 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1273 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-for ac_hdr in \
-		openssl/err.h \
-		openssl/engine.h \
-	
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1310: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1315 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
 	targetname=rlm_eap_sim
 else
 	targetname=
@@ -1504,7 +913,6 @@
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@CC@%$CC%g
-s%@CPP@%$CPP%g
 s%@eap_sim_ldflags@%$eap_sim_ldflags%g
 s%@eap_sim_cflags@%$eap_sim_cflags%g
 s%@targetname@%$targetname%g
diff -urNad --exclude=CVS --exclude=.svn ./src/modules/rlm_eap/types/rlm_eap_sim/configure.in /tmp/dpep-work.ZipMl1/release_1_0/src/modules/rlm_eap/types/rlm_eap_sim/configure.in
--- ./src/modules/rlm_eap/types/rlm_eap_sim/configure.in	2004-02-05 18:29:57.000000000 +1100
+++ /tmp/dpep-work.ZipMl1/release_1_0/src/modules/rlm_eap/types/rlm_eap_sim/configure.in	2005-08-23 17:12:41.000000000 +1000
@@ -9,54 +9,6 @@
 
 	AC_PROG_CC
 
-	dnl #
-	dnl # extra argument: --openssl-includes=dir
-	dnl #
-	AC_ARG_WITH(openssl-includes,
-	[  --with-openssl-includes=DIR       Directory to look for OpenSSL include files],
-	[ case "$withval" in
-	    *)
-		rlm_eap_peap_inc_dir="$rlm_eap_peap_inc_dir $withval"
-		SMART_CFLAGS="$SMART_CFLAGS -I$withval"
-		;;
-	  esac ]
-	)
-
-	dnl #
-	dnl # extra argument: --openssl-libraries=dir
-	dnl #
-	AC_ARG_WITH(openssl-libraries,
-	[  --with-openssl-libraries=DIR      Directory to look for OpenSSL library files],
-	[ case "$withval" in
-	    *)
-		rlm_eap_peap_lib_dir="$rlm_eap_peap_lib_dir $withval"
-		SMART_LIBS="$SMART_LIBS -L$withval"
-		;;
-	  esac ]
-	)
-
-	smart_try_dir=$rlm_eap_peap_inc_dir
-	AC_SMART_CHECK_INCLUDE(openssl/ssl.h)
-	if test "x$ac_cv_header_openssl_ssl_h" != "xyes"; then
-		fail="$fail (openssl/ssl.h)"
-	fi
-
-	smart_try_dir=$rlm_eap_peap_lib_dir
-	AC_SMART_CHECK_LIB(crypto, DH_new)
-    if test "x$ac_cv_lib_crypto_DH_new" != "xyes"; then
- 	    fail="$fail libcrypto"
-    fi
-
-	AC_SMART_CHECK_LIB(ssl, SSL_new)
-    if test "x$ac_cv_lib_ssl_SSL_new" != "xyes"; then
- 	    fail="$fail libssl"
-    fi
-
-	AC_CHECK_HEADERS( \
-		openssl/err.h \
-		openssl/engine.h \
-	)
-
 	targetname=modname
 else
 	targetname=