Skip to content

Commit 630fa6f

Browse files
tglsfdctglsfdc
committed
Allow MinGW builds to use standardly-named OpenSSL libraries.
In the Fedora variant of MinGW, the openssl libraries have their normal names, not libeay32 and libssleay32. Adjust configure probes to allow that, per bug #6486. Tomasz Ostrowski
1 parent 602dd1e commit 630fa6f

File tree

4 files changed

+68
-56
lines changed

4 files changed

+68
-56
lines changed

‎configure

Lines changed: 66 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9132,14 +9132,12 @@ $as_echo "$as_me: error: library 'ssl' is required for OpenSSL" >&2;}
91329132
fi
91339133

91349134
else
9135-
9136-
{ $as_echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -leay32" >&5
9137-
$as_echo_n "checking for CRYPTO_new_ex_data in -leay32... " >&6; }
9138-
if test "${ac_cv_lib_eay32_CRYPTO_new_ex_data+set}" = set; then
9135+
{ $as_echo "$as_me:$LINENO: checking for library containing CRYPTO_new_ex_data" >&5
9136+
$as_echo_n "checking for library containing CRYPTO_new_ex_data... " >&6; }
9137+
if test "${ac_cv_search_CRYPTO_new_ex_data+set}" = set; then
91399138
$as_echo_n "(cached) " >&6
91409139
else
9141-
ac_check_lib_save_LIBS=$LIBS
9142-
LIBS="-leay32 $LIBS"
9140+
ac_func_search_save_LIBS=$LIBS
91439141
cat >conftest.$ac_ext <<_ACEOF
91449142
/* confdefs.h. */
91459143
_ACEOF
@@ -9162,7 +9160,14 @@ return CRYPTO_new_ex_data ();
91629160
return 0;
91639161
}
91649162
_ACEOF
9165-
rm -f conftest.$ac_objext conftest$ac_exeext
9163+
for ac_lib in '' eay32 crypto; do
9164+
if test -z "$ac_lib"; then
9165+
ac_res="none required"
9166+
else
9167+
ac_res=-l$ac_lib
9168+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9169+
fi
9170+
rm -f conftest.$ac_objext conftest$ac_exeext
91669171
if { (ac_try="$ac_link"
91679172
case "(($ac_try" in
91689173
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9183,42 +9188,47 @@ $as_echo "$ac_try_echo") >&5
91839188
test "$cross_compiling" = yes ||
91849189
$as_test_x conftest$ac_exeext
91859190
}; then
9186-
ac_cv_lib_eay32_CRYPTO_new_ex_data=yes
9191+
ac_cv_search_CRYPTO_new_ex_data=$ac_res
91879192
else
91889193
$as_echo "$as_me: failed program was:" >&5
91899194
sed 's/^/| /' conftest.$ac_ext >&5
91909195

9191-
ac_cv_lib_eay32_CRYPTO_new_ex_data=no
9196+
91929197
fi
91939198

91949199
rm -rf conftest.dSYM
91959200
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9196-
conftest$ac_exeext conftest.$ac_ext
9197-
LIBS=$ac_check_lib_save_LIBS
9201+
conftest$ac_exeext
9202+
if test "${ac_cv_search_CRYPTO_new_ex_data+set}" = set; then
9203+
break
91989204
fi
9199-
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_eay32_CRYPTO_new_ex_data" >&5
9200-
$as_echo "$ac_cv_lib_eay32_CRYPTO_new_ex_data" >&6; }
9201-
if test "x$ac_cv_lib_eay32_CRYPTO_new_ex_data" = x""yes; then
9202-
cat >>confdefs.h <<_ACEOF
9203-
#define HAVE_LIBEAY32 1
9204-
_ACEOF
9205-
9206-
LIBS="-leay32 $LIBS"
9205+
done
9206+
if test "${ac_cv_search_CRYPTO_new_ex_data+set}" = set; then
9207+
:
9208+
else
9209+
ac_cv_search_CRYPTO_new_ex_data=no
9210+
fi
9211+
rm conftest.$ac_ext
9212+
LIBS=$ac_func_search_save_LIBS
9213+
fi
9214+
{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_CRYPTO_new_ex_data" >&5
9215+
$as_echo "$ac_cv_search_CRYPTO_new_ex_data" >&6; }
9216+
ac_res=$ac_cv_search_CRYPTO_new_ex_data
9217+
if test "$ac_res" != no; then
9218+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
92079219

92089220
else
9209-
{ { $as_echo "$as_me:$LINENO: error: library 'eay32' is required for OpenSSL" >&5
9210-
$as_echo "$as_me: error: library 'eay32' is required for OpenSSL" >&2;}
9221+
{ { $as_echo "$as_me:$LINENO: error: library 'eay32' or 'crypto' is required for OpenSSL" >&5
9222+
$as_echo "$as_me: error: library 'eay32' or 'crypto' is required for OpenSSL" >&2;}
92119223
{ (exit 1); exit 1; }; }
92129224
fi
92139225

9214-
9215-
{ $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lssleay32" >&5
9216-
$as_echo_n "checking for SSL_library_init in -lssleay32... " >&6; }
9217-
if test "${ac_cv_lib_ssleay32_SSL_library_init+set}" = set; then
9226+
{ $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5
9227+
$as_echo_n "checking for library containing SSL_library_init... " >&6; }
9228+
if test "${ac_cv_search_SSL_library_init+set}" = set; then
92189229
$as_echo_n "(cached) " >&6
92199230
else
9220-
ac_check_lib_save_LIBS=$LIBS
9221-
LIBS="-lssleay32 $LIBS"
9231+
ac_func_search_save_LIBS=$LIBS
92229232
cat >conftest.$ac_ext <<_ACEOF
92239233
/* confdefs.h. */
92249234
_ACEOF
@@ -9241,7 +9251,14 @@ return SSL_library_init ();
92419251
return 0;
92429252
}
92439253
_ACEOF
9244-
rm -f conftest.$ac_objext conftest$ac_exeext
9254+
for ac_lib in '' ssleay32 ssl; do
9255+
if test -z "$ac_lib"; then
9256+
ac_res="none required"
9257+
else
9258+
ac_res=-l$ac_lib
9259+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9260+
fi
9261+
rm -f conftest.$ac_objext conftest$ac_exeext
92459262
if { (ac_try="$ac_link"
92469263
case "(($ac_try" in
92479264
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9262,31 +9279,38 @@ $as_echo "$ac_try_echo") >&5
92629279
test "$cross_compiling" = yes ||
92639280
$as_test_x conftest$ac_exeext
92649281
}; then
9265-
ac_cv_lib_ssleay32_SSL_library_init=yes
9282+
ac_cv_search_SSL_library_init=$ac_res
92669283
else
92679284
$as_echo "$as_me: failed program was:" >&5
92689285
sed 's/^/| /' conftest.$ac_ext >&5
92699286

9270-
ac_cv_lib_ssleay32_SSL_library_init=no
9287+
92719288
fi
92729289

92739290
rm -rf conftest.dSYM
92749291
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9275-
conftest$ac_exeext conftest.$ac_ext
9276-
LIBS=$ac_check_lib_save_LIBS
9292+
conftest$ac_exeext
9293+
if test "${ac_cv_search_SSL_library_init+set}" = set; then
9294+
break
92779295
fi
9278-
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssleay32_SSL_library_init" >&5
9279-
$as_echo "$ac_cv_lib_ssleay32_SSL_library_init" >&6; }
9280-
if test "x$ac_cv_lib_ssleay32_SSL_library_init" = x""yes; then
9281-
cat >>confdefs.h <<_ACEOF
9282-
#define HAVE_LIBSSLEAY32 1
9283-
_ACEOF
9284-
9285-
LIBS="-lssleay32 $LIBS"
9296+
done
9297+
if test "${ac_cv_search_SSL_library_init+set}" = set; then
9298+
:
9299+
else
9300+
ac_cv_search_SSL_library_init=no
9301+
fi
9302+
rm conftest.$ac_ext
9303+
LIBS=$ac_func_search_save_LIBS
9304+
fi
9305+
{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_SSL_library_init" >&5
9306+
$as_echo "$ac_cv_search_SSL_library_init" >&6; }
9307+
ac_res=$ac_cv_search_SSL_library_init
9308+
if test "$ac_res" != no; then
9309+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
92869310

92879311
else
9288-
{ { $as_echo "$as_me:$LINENO: error: library 'ssleay32' is required for OpenSSL" >&5
9289-
$as_echo "$as_me: error: library 'ssleay32' is required for OpenSSL" >&2;}
9312+
{ { $as_echo "$as_me:$LINENO: error: library 'ssleay32' or 'ssl' is required for OpenSSL" >&5
9313+
$as_echo "$as_me: error: library 'ssleay32' or 'ssl' is required for OpenSSL" >&2;}
92909314
{ (exit 1); exit 1; }; }
92919315
fi
92929316

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,8 +947,8 @@ if test "$with_openssl" = yes ; then
947947
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
948948
AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
949949
else
950-
AC_CHECK_LIB(eay32, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'eay32' is required for OpenSSL])])
951-
AC_CHECK_LIB(ssleay32, SSL_library_init, [], [AC_MSG_ERROR([library 'ssleay32' is required for OpenSSL])])
950+
AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
951+
AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
952952
fi
953953
fi
954954

‎src/include/pg_config.h.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,6 @@
290290
/* Define to 1 if you have the `crypto' library (-lcrypto). */
291291
#undef HAVE_LIBCRYPTO
292292

293-
/* Define to 1 if you have the `eay32' library (-leay32). */
294-
#undef HAVE_LIBEAY32
295-
296293
/* Define to 1 if you have the `ldap' library (-lldap). */
297294
#undef HAVE_LIBLDAP
298295

@@ -314,9 +311,6 @@
314311
/* Define to 1 if you have the `ssl' library (-lssl). */
315312
#undef HAVE_LIBSSL
316313

317-
/* Define to 1 if you have the `ssleay32' library (-lssleay32). */
318-
#undef HAVE_LIBSSLEAY32
319-
320314
/* Define to 1 if you have the `wldap32' library (-lwldap32). */
321315
#undef HAVE_LIBWLDAP32
322316

‎src/include/pg_config.h.win32

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@
214214
/* Define to 1 if you have the `crypto' library (-lcrypto). */
215215
/* #undef HAVE_LIBCRYPTO */
216216

217-
/* Define to 1 if you have the `eay32' library (-leay32). */
218-
/* #undef HAVE_LIBEAY32 */
219-
220217
/* Define to 1 if you have the `ldap' library (-lldap). */
221218
/* #undef HAVE_LIBLDAP */
222219

@@ -229,9 +226,6 @@
229226
/* Define to 1 if you have the `ssl' library (-lssl). */
230227
/* #undef HAVE_LIBSSL */
231228

232-
/* Define to 1 if you have the `ssleay32' library (-lssleay32). */
233-
/* #undef HAVE_LIBSSLEAY32 */
234-
235229
/* Define to 1 if you have the `wldap32' library (-lwldap32). */
236230
/* #undef HAVE_LIBWLDAP32 */
237231

0 commit comments

Comments
 (0)