X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure;h=dd658dff943a218d4bc22b56299e58df8b339f2b;hp=67a294889e103aaa239e06c9d573bdeadf90eda6;hb=70deb804d2211535f1f188a14e8fc867db9c6625;hpb=1a394135e58799a4fa48e87ab32e85a4d0bf5139

diff --git a/configure b/configure
index 67a2948..dd658df 100755
--- a/configure
+++ b/configure
@@ -594,7 +594,7 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 top_builddir
-CRYPTO
+SSLLIB
 BZLIB
 ZLIB
 READLINE
@@ -5107,9 +5107,9 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
-$as_echo_n "checking for compress2 in -lz... " >&6; }
-if test "${ac_cv_lib_z_compress2+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
+$as_echo_n "checking for zlibVersion in -lz... " >&6; }
+if test "${ac_cv_lib_z_zlibVersion+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5123,27 +5123,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char compress2 ();
+char zlibVersion ();
 int
 main ()
 {
-return compress2 ();
+return zlibVersion ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_compress2=yes
+  ac_cv_lib_z_zlibVersion=yes
 else
-  ac_cv_lib_z_compress2=no
+  ac_cv_lib_z_zlibVersion=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress2" >&5
-$as_echo "$ac_cv_lib_z_compress2" >&6; }
-if test "x$ac_cv_lib_z_compress2" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5
+$as_echo "$ac_cv_lib_z_zlibVersion" >&6; }
+if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then :
   zlib_lib=yes
 else
   zlib_lib=no
@@ -5277,8 +5277,7 @@ rm -f conftest*
 
 fi
 
-if test "$ERMT" != ""; then
-	ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default"
+ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default"
 if test "x$ac_cv_header_openssl_evp_h" = x""yes; then :
   evp_h=yes
 else
@@ -5286,7 +5285,7 @@ else
 fi
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_CIPHER_CTX_set_padding in -lcrypto" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_CIPHER_CTX_set_padding in -lcrypto" >&5
 $as_echo_n "checking for EVP_CIPHER_CTX_set_padding in -lcrypto... " >&6; }
 if test "${ac_cv_lib_crypto_EVP_CIPHER_CTX_set_padding+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -5328,23 +5327,18 @@ else
   crypto_lib=no
 fi
 
-	if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcrypto") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+if test "$evp_h" = yes -a "$crypto_lib" = yes; then
+	if test "$STATICZ" = yes; then
+		SSLLIB="-Wl,-Bstatic -lssl -Wl,-Bdynamic"
+	else
+		SSLLIB="-lssl"
+	fi
 
-		if test -n $STATIC ; then
-			CRYPTO=`$PKG_CONFIG --libs --static libcrypto`
-		else
-			CRYPTO=`$PKG_CONFIG --libs libcrypto`
-		fi
+$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
 
 else
-  CRYPTO=""
-fi
-	if test "$evp_h" = no -o "x$CRYPTO" = "x"; then
+	SSLLIB=""
+	if test "$ERMT" != ""; then
 		as_fn_error or configure without --enable-ermt "You need to install the OpenSSL library (version 0.9.7a or later)" "$LINENO" 5
 	fi
 fi
@@ -5379,7 +5373,7 @@ top_builddir=`cd .; pwd`
 test -d compat || mkdir compat
 test -d compat/lib || mkdir compat/lib
 
-ac_config_files="$ac_config_files MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE"
+ac_config_files="$ac_config_files MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile testing/Makefile $RMTMAKEFILE"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6079,6 +6073,7 @@ do
     "compat/lib/Makefile") CONFIG_FILES="$CONFIG_FILES compat/lib/Makefile" ;;
     "dump/Makefile") CONFIG_FILES="$CONFIG_FILES dump/Makefile" ;;
     "restore/Makefile") CONFIG_FILES="$CONFIG_FILES restore/Makefile" ;;
+    "testing/Makefile") CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;;
     "$RMTMAKEFILE") CONFIG_FILES="$CONFIG_FILES $RMTMAKEFILE" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;