"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.in" between
bahamut-2.1.4.tar.gz and bahamut-2.1.5.tar.gz

About: Bahamut is an Internet Relay Chat Daemon (IRCd) designed for DALnet, one of the major IRC networks in the world.

configure.in  (bahamut-2.1.4):configure.in  (bahamut-2.1.5)
skipping to change at line 428 skipping to change at line 428
AC_MSG_CHECKING(for OpenSSL) AC_MSG_CHECKING(for OpenSSL)
if test "X$cf_enable_openssl" != "Xno" ; then if test "X$cf_enable_openssl" != "Xno" ; then
cf_openssl_basedir="" cf_openssl_basedir=""
if test "X$cf_enable_openssl" != "Xauto" && if test "X$cf_enable_openssl" != "Xauto" &&
test "X$cf_enable_openssl" != "Xyes"; then test "X$cf_enable_openssl" != "Xyes"; then
dnl Support for --enable-openssl=/some/place dnl Support for --enable-openssl=/some/place
cf_openssl_basedir="${cf_enable_openssl}" cf_openssl_basedir="${cf_enable_openssl}"
else else
dnl Do the auto-probe here. Check some common directory paths. dnl Do the auto-probe here. Check some common directory paths.
for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\ for dirs in $HOME/openssl /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/l ib/ssl\
/opt /opt/openssl /usr/local/openssl ; do /opt /opt/openssl /usr/local/openssl ; do
if test -f "${dirs}/include/openssl/opensslv.h" ; then if test -f "${dirs}/include/openssl/opensslv.h" ; then
cf_openssl_basedir="${dirs}" cf_openssl_basedir="${dirs}"
break break
fi fi
done done
unset dirs unset dirs
fi fi
dnl Now check cf_openssl_found to see if we found anything. dnl Now check cf_openssl_found to see if we found anything.
if test "X$cf_openssl_basedir" != "X" ; then if test "X$cf_openssl_basedir" != "X" ; then
if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" ; then if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" ; then
SSL_INCLUDES="-I${cf_openssl_basedir}/include" SSL_INCLUDES="-I${cf_openssl_basedir}/include"
SSL_LDFLAGS="-L${cf_openssl_basedir}/lib" SSL_LDFLAGS="-L${cf_openssl_basedir}/lib"
if test "$cf_openssl_basedir" = "$HOME/openssl"; then
SSL_LDFLAGS="-L${cf_openssl_basedir}/lib -Wl,-rpath,${cf_openssl_basedir
}/lib"
fi
else else
dnl OpenSSL wasn't found in the directory specified. Naughty dnl OpenSSL wasn't found in the directory specified. Naughty
dnl administrator... dnl administrator...
cf_openssl_basedir="" cf_openssl_basedir=""
fi fi
else else
dnl Check for stock FreeBSD 4.x and 5.x systems, since their files dnl Check for stock FreeBSD 4.x and 5.x systems, since their files
dnl are in /usr/include and /usr/lib. In this case, we don't want to dnl are in /usr/include and /usr/lib. In this case, we don't want to
dnl change INCLUDES or LIBS, but still want to enable OpenSSL. dnl change INCLUDES or LIBS, but still want to enable OpenSSL.
dnl We can't do this check above, because some people want two versions dnl We can't do this check above, because some people want two versions
skipping to change at line 468 skipping to change at line 471
dnl If we have a basedir defined, then everything is okay. Otherwise, dnl If we have a basedir defined, then everything is okay. Otherwise,
dnl we have a problem. dnl we have a problem.
if test "X$cf_openssl_basedir" != "X" ; then if test "X$cf_openssl_basedir" != "X" ; then
CPPFLAGS="$CPPFLAGS $SSL_INCLUDES" CPPFLAGS="$CPPFLAGS $SSL_INCLUDES"
LDFLAGS="$LDFLAGS $SSL_LDFLAGS" LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
LIBS="-lssl -lcrypto $save_LIBS" LIBS="-lssl -lcrypto $save_LIBS"
AC_MSG_RESULT($cf_openssl_basedir) AC_MSG_RESULT($cf_openssl_basedir)
cf_enable_openssl="yes" cf_enable_openssl="yes"
encryption="enabled" encryption="enabled"
AC_DEFINE(HAVE_ENCRYPTION_ON) AC_DEFINE(HAVE_ENCRYPTION_ON)
ENCRYPT_SRC="rc4.c dh.c" ENCRYPT_SRC="rc4.c dh.c libcrypto-compat.c"
AC_SUBST(ENCRYPT_SRC) AC_SUBST(ENCRYPT_SRC)
else else
AC_MSG_RESULT(not found. Please check your path.) AC_MSG_RESULT(not found. Please check your path.)
cf_enable_openssl="no" cf_enable_openssl="no"
encryption="disabled" encryption="disabled"
fi fi
unset cf_openssl_basedir unset cf_openssl_basedir
else else
dnl If --disable-openssl was specified dnl If --disable-openssl was specified
encryption="disabled" encryption="disabled"
skipping to change at line 731 skipping to change at line 734
AC_MSG_ERROR(either specify a valid zlib installation with --wit h-zlib=DIR or disable zlib usage with --without-zlib) AC_MSG_ERROR(either specify a valid zlib installation with --wit h-zlib=DIR or disable zlib usage with --without-zlib)
fi fi
fi fi
if test "$engine" = "select" && test "$broken_fd_setsize" != "yes"; then if test "$engine" = "select" && test "$broken_fd_setsize" != "yes"; then
CFLAGS="$CFLAGS -DFD_SETSIZE=$maxconnections" CFLAGS="$CFLAGS -DFD_SETSIZE=$maxconnections"
fi fi
if test $prefix = NONE; then if test $prefix = NONE; then
prefix=${HOME}/ircd prefix=${HOME}/ircd
if test -f "${HOME}/bahamut/ircd" ; then
prefix=${HOME}/bahamut
fi
if test -f "${HOME}/dalnet/ircd" ; then
prefix=${HOME}/dalnet
fi
fi fi
INSTALL_DIR="${prefix}" INSTALL_DIR="${prefix}"
AC_SUBST(LIBS) AC_SUBST(LIBS)
AC_SUBST(SENGINE) AC_SUBST(SENGINE)
AC_SUBST(INSTALL_DIR) AC_SUBST(INSTALL_DIR)
AC_CONFIG_FILES([Makefile src/Makefile tools/Makefile doc/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile tools/Makefile doc/Makefile])
AC_OUTPUT AC_OUTPUT
 End of changes. 4 change blocks. 
2 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)