- Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list

problems with gcc/Solaris.
This commit is contained in:
Damien Miller 2000-03-15 10:04:54 +11:00
parent 086b171730
commit a1ad4802ff
2 changed files with 22 additions and 14 deletions

View File

@ -1,3 +1,7 @@
20000315
- Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list
problems with gcc/Solaris.
20000314 20000314
- Include macro for IN6_IS_ADDR_V4MAPPED. Report from - Include macro for IN6_IS_ADDR_V4MAPPED. Report from
peter@frontierflying.com peter@frontierflying.com

View File

@ -158,6 +158,7 @@ AC_ARG_WITH(ssl-dir,
) )
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
saved_LDFLAGS="$LDFLAGS"
saved_CFLAGS="$CFLAGS" saved_CFLAGS="$CFLAGS"
if test "x$prefix" != "xNONE" ; then if test "x$prefix" != "xNONE" ; then
tryssldir="$tryssldir $prefix" tryssldir="$tryssldir $prefix"
@ -165,19 +166,21 @@ fi
AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
if test ! -z "$ssldir" ; then if test ! -z "$ssldir" ; then
LIBS="$saved_LIBS -L$ssldir/lib -L$ssldir -lcrypto" LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
CFLAGS="$CFLAGS -I$ssldir/include" CFLAGS="$saved_CFLAGS -I$ssldir/include"
if test "x$need_dash_r" = "x1" ; then if test ! -z "$need_dash_r" ; then
LIBS="$LIBS -R$ssldir/lib -L$ssldir" LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
fi fi
else else
LIBS="$saved_LIBS -lcrypto" LDFLAGS="$saved_LDFLAGS"
fi fi
for WANTS_RSAREF in "" 1 ; do for WANTS_RSAREF in "" 1 ; do
if test ! -z "$WANTS_RSAREF" ; then if test -z "$WANTS_RSAREF" ; then
LIBS="$LIBS -lRSAglue -lrsaref" LIBS="$saved_LIBS -lcrypto"
else
LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
fi fi
AC_TRY_RUN( AC_TRY_RUN(
@ -225,15 +228,16 @@ fi
if test -z "$ssldir" ; then if test -z "$ssldir" ; then
ssldir="(system)" ssldir="(system)"
else else
CFLAGS="$CFLAGS -I$ssldir/include" CFLAGS="$saved_CFLAGS -I$ssldir/include"
LDFLAGS="$LDFLAGS -L$ssldir/lib" LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
if test "x$need_dash_r" = "x1" ; then if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir" LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
fi fi
fi fi
LIBS="$saved_LIBS -lcrypto" if test -z "$WANTS_RSAREF" ; then
if test ! -z "$WANTS_RSAREF" ; then LIBS="$saved_LIBS -lcrypto"
LIBS="$LIBS -lRSAglue -lrsaref" else
LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
fi fi
AC_MSG_RESULT($ssldir) AC_MSG_RESULT($ssldir)