From 1d30ce48f0d3f1d4da3221b0c44e8d05658bf0fc Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 3 Mar 2010 14:38:40 +0100 Subject: [PATCH] Tweak rebuild configure --- bacula/autoconf/config.h.in | 3 + bacula/configure | 235 ++++++++++++++++++++++++++++-------- 2 files changed, 188 insertions(+), 50 deletions(-) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 9e1089955b..84177517e1 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -600,6 +600,9 @@ /* Define if the OpenSSL library is export-contrained to 128bit ciphers */ #undef HAVE_OPENSSL_EXPORT_LIBRARY +/* Set if have OpenSSL version 1.x */ +#undef HAVE_OPENSSLv1 + /* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE diff --git a/bacula/configure b/bacula/configure index fa9801303f..652f99adf5 100755 --- a/bacula/configure +++ b/bacula/configure @@ -24477,9 +24477,8 @@ _ACEOF fi -got_conio="no" -if test x$support_conio = xyes; then - if test "${ac_cv_header_termcap_h+set}" = set; then +TERM_LIB="" +if test "${ac_cv_header_termcap_h+set}" = set; then { echo "$as_me:$LINENO: checking for termcap.h" >&5 echo $ECHO_N "checking for termcap.h... $ECHO_C" >&6; } if test "${ac_cv_header_termcap_h+set}" = set; then @@ -24667,17 +24666,7 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; } if test $ac_cv_lib_termcap_tgetent = yes; then - CONS_LIBS="-ltermcap" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONIO 1 -_ACEOF - - + TERM_LIB="-ltermcap" else { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; } @@ -24741,17 +24730,7 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; } if test $ac_cv_lib_ncurses_tgetent = yes; then - CONS_LIBS="-lncurses" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONIO 1 -_ACEOF - - + TERM_LIB="-lncurses" fi @@ -24760,7 +24739,6 @@ fi else - for ac_header in curses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -24900,22 +24878,25 @@ fi done - { echo "$as_me:$LINENO: checking for term.h" >&5 + if test "${ac_cv_header_term_h+set}" = set; then + { echo "$as_me:$LINENO: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6; } if test "${ac_cv_header_term_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5 +echo "${ECHO_T}$ac_cv_header_term_h" >&6; } else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking term.h usability" >&5 +echo $ECHO_N "checking term.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if HAVE_CURSES_H -#include -#endif - - +$ac_includes_default #include _ACEOF rm -f conftest.$ac_objext @@ -24935,18 +24916,93 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_term_h=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_term_h=no + ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking term.h presence" >&5 +echo $ECHO_N "checking term.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: term.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: term.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: term.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: term.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: term.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: term.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: term.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: term.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: term.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: term.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for term.h" >&5 +echo $ECHO_N "checking for term.h... $ECHO_C" >&6; } +if test "${ac_cv_header_term_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_term_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5 echo "${ECHO_T}$ac_cv_header_term_h" >&6; } + +fi if test $ac_cv_header_term_h = yes; then { echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6; } @@ -25010,29 +25066,35 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5 echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6; } if test $ac_cv_lib_curses_tgetent = yes; then - CONS_LIBS="-lcurses" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONIO 1 -_ACEOF + TERM_LIB="-lcurses" +fi fi -else - echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " " + fi -fi +got_conio="no" +if test x$support_conio = xyes; then + if test x$TERM_LIB != x; then + CONS_LIBS=$TERM_LIB + CONS_OBJ="conio.o" + CONS_SRC="conio.c" + got_conio="yes" + support_readline=no + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CONIO 1 +_ACEOF + else + echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "], + fi fi @@ -25046,6 +25108,9 @@ if test "${enable_readline+set}" = set; then fi +if test x$TERM_LIB = x ; then + support_readline=no +fi got_readline="no" READLINE_SRC= @@ -25205,7 +25270,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_READLINE 1 _ACEOF - CONS_LIBS="-lreadline -lhistory -ltermcap" + CONS_LIBS="-lreadline -lhistory $TERM_LIB" got_readline="yes" else @@ -25357,7 +25422,7 @@ _ACEOF got_readline="yes" CONS_INC="-I/usr/include/readline" - CONS_LIBS="-lreadline -ltermcap" + CONS_LIBS="-lreadline $TERM_LIB" else @@ -25498,7 +25563,7 @@ _ACEOF got_readline="yes" CONS_INC="-I${TOP_DIR}/depkgs/readline" - CONS_LIBS="-lreadline -lhistory -ltermcap" + CONS_LIBS="-lreadline -lhistory $TERM_LIB" CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline" PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline" @@ -27211,6 +27276,76 @@ fi if test "$support_crypto" = "no"; then OPENSSL_LIBS="" OPENSSL_INC="" +else + { echo "$as_me:$LINENO: checking for EVP_PKEY_encrypt_old in -lssl" >&5 +echo $ECHO_N "checking for EVP_PKEY_encrypt_old in -lssl... $ECHO_C" >&6; } +if test "${ac_cv_lib_ssl_EVP_PKEY_encrypt_old+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char EVP_PKEY_encrypt_old (); +int +main () +{ +return EVP_PKEY_encrypt_old (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ssl_EVP_PKEY_encrypt_old=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ssl_EVP_PKEY_encrypt_old=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_EVP_PKEY_encrypt_old" >&5 +echo "${ECHO_T}$ac_cv_lib_ssl_EVP_PKEY_encrypt_old" >&6; } +if test $ac_cv_lib_ssl_EVP_PKEY_encrypt_old = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPENSSLv1 1 +_ACEOF + +fi + fi { echo "$as_me:$LINENO: result: $support_tls" >&5 -- 2.39.5