moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

made pkg-config not get used if a path is given with --with-ssl

This commit is contained in:
Daniel Stenberg 2004-09-28 22:04:05 +00:00
parent 1003628103
commit 75e5967afd
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
configure.ac
View File

@ -707,9 +707,29 @@ else
CLEANCPPFLAGS="$CPPFLAGS" CLEANCPPFLAGS="$CPPFLAGS"
CLEANLIBS="$LIBS" CLEANLIBS="$LIBS"
dnl Detect the pkg-config tool, as it may have extra info about the openssl case "$OPT_SSL" in
dnl installation we can use. I *believe* this is what we are expected to do yes)
dnl on really recent Redhat Linux hosts. dnl --with-ssl (without path) used
PKGTEST="yes"
EXTRA_SSL=/usr/local/ssl ;;
off)
dnl no --with-ssl option given, just check default places
PKGTEST="yes"
EXTRA_SSL= ;;
*)
dnl check the given --with-ssl spot
PKGTEST="no"
EXTRA_SSL=$OPT_SSL
LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
;;
esac
if test "$PKGTEST" = "yes"; then
dnl Detect the pkg-config tool, as it may have extra info about the
dnl openssl installation we can use. I *believe* this is what we are
dnl expected to do on really recent Redhat Linux hosts.
AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin) AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
if test "$PKGCONFIG" != "no" ; then if test "$PKGCONFIG" != "no" ; then
@ -732,19 +752,7 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
fi fi
fi
case "$OPT_SSL" in
yes)
EXTRA_SSL=/usr/local/ssl ;;
off)
EXTRA_SSL= ;;
*)
dnl check the given spot right away!
EXTRA_SSL=$OPT_SSL
LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
;;
esac
AC_CHECK_LIB(crypto, CRYPTO_lock,[ AC_CHECK_LIB(crypto, CRYPTO_lock,[
HAVECRYPTO="yes" HAVECRYPTO="yes"