--- ermyth/configure.ac 2007/07/25 01:05:17 1.7 +++ ermyth/configure.ac 2007/08/28 17:08:06 1.8 @@ -2,7 +2,7 @@ dnl Copyright © 2005 Atheme Development Group dnl Rights to this code are documented in doc/pod/license.pod. dnl -dnl $Id: configure.ac,v 1.7 2007/07/25 01:05:17 pippijn Exp $ +dnl $Id: configure.ac,v 1.8 2007/08/28 17:08:06 pippijn Exp $ dnl Process this file with autoconf to produce a configure script. @@ -11,7 +11,7 @@ AC_CONFIG_HEADER(include/sysconf.h) AC_CONFIG_AUX_DIR(autoconf) -AC_COPYRIGHT([$Id: configure.ac,v 1.7 2007/07/25 01:05:17 pippijn Exp $]) +AC_COPYRIGHT([$Id: configure.ac,v 1.8 2007/08/28 17:08:06 pippijn Exp $]) AC_PREFIX_DEFAULT(~/PACKAGE) @@ -36,16 +36,14 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -#-------------------------------------------------- -# AC_MSG_CHECKING(glib >= 2.10) -# if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then -# CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`" -# LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`" -# AC_MSG_RESULT(ok) -# else -# AC_MSG_ERROR(no) -# fi -#-------------------------------------------------- +AC_MSG_CHECKING(glib >= 2.10) +if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then + CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`" + LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`" + AC_MSG_RESULT(ok) +else + AC_MSG_ERROR(no) +fi AC_PATH_PROG(PERL, perl5.8) if test -z "$PERL"; then @@ -62,8 +60,8 @@ dnl Source generation dnl -CALLBACKS=`$PERL $srcdir/include/common/gencallbacks.pl 7` -AC_SUBST(CALLBACKS) +dnl CALLBACKS=`$PERL $srcdir/include/common/gencallbacks.pl 7` +dnl AC_SUBST(CALLBACKS) dnl dnl GNU gettext @@ -205,6 +203,22 @@ LIBS="$LIBS -lcrypt" ]) +AC_MSG_CHECKING(for libresolv) +AC_TRY_LINK([ +#include +#include +#include +],[ + res_init (); +],[resolv_link=yes],[resolv_link=no]) +if test x$resolv_link = xyes; then + AC_MSG_RESULT(ok) + AC_DEFINE(HAVE_LIBRESOLV, 1, Define if you have libresolv) + LIBS="$LIBS -lresolv" +else + AC_MSG_RESULT([no, unable to link]) +fi + AC_MSG_CHECKING(for $PERL suitability) if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then save_CXXFLAGS="$CXXFLAGS" @@ -450,10 +464,6 @@ OPENSSL_FOUND=no ],[]) -if test x$OPENSSL_FOUND != xno; then - LIBS="$LIBS -lssl -lcrypto" -fi - AM_CONDITIONAL(HAVE_OPENSSL,test x$OPENSSL_FOUND != xno) echo @@ -463,23 +473,6 @@ dynamic_loading="yes" if test "$dynamic_loading" = yes; then - AC_CHECK_HEADERS(dlfcn.h) - AC_SEARCH_LIBS(dlopen, [dl c_r], - [ - AC_DEFINE(HAVE_DLOPEN, 1, [Define if the dlopen function is available.]) - AC_CHECK_FUNC(dlsym, , - [ - AC_ERROR([dynamic loading unavailable, $PACKAGE will not work on your system]) - ]) - AC_CHECK_FUNCS(dlfunc) - AC_CHECK_FUNCS(dlinfo) - ], - [ - AC_ERROR([dynamic loading unavailable, $PACKAGE will not work on your system]) - ]) -fi - -if test "$dynamic_loading" = yes; then # The GNU linker requires the -export-dynamic option to make # all symbols visible in the dynamic symbol table. hold_ldflags=$LDFLAGS @@ -565,39 +558,36 @@ AC_ARG_ENABLE(warnings, AC_HELP_STRING([--enable-warnings],[ Enable compiler warnings]), [ -echo + +echo " " echo "Compiler warnings" -echo +echo " " dnl See what warnings we can get away with ERMYTH_C_GCC_TRY_FLAGS([-Wall], ermyth_cv_c_gcc_w_all) ERMYTH_C_GCC_TRY_FLAGS([-Wpointer-arith], ermyth_cv_c_gcc_w_pointer_arith) -ERMYTH_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], ermyth_cv_c_gcc_w_implicit) +ERMYTH_C_GCC_TRY_FLAGS([-Wimplicit], ermyth_cv_c_gcc_w_implicit) ERMYTH_C_GCC_TRY_FLAGS([-Wcast-align], ermyth_cv_c_gcc_w_cast_align) ERMYTH_C_GCC_TRY_FLAGS([-Wcast-qual], ermyth_cv_c_gcc_w_cast_qual) -ERMYTH_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], ermyth_cv_c_gcc_prototypes) -ERMYTH_C_GCC_TRY_FLAGS([-Wparenthesis], ermyth_cv_c_gcc_parenthesis) ERMYTH_C_GCC_TRY_FLAGS([-Wextra], ermyth_cv_c_gcc_w_extra) ERMYTH_C_GCC_TRY_FLAGS([-W -Wno-unused-parameter], ermyth_cv_c_gcc_w) ERMYTH_C_GCC_TRY_FLAGS([-Wshadow], ermyth_cv_c_gcc_w_shadow) ERMYTH_C_GCC_TRY_FLAGS([-Wmissing-noreturn], ermyth_cv_c_gcc_w_missing_noreturn) ERMYTH_C_GCC_TRY_FLAGS([-Wundef], ermyth_cv_c_gcc_w_undef) ERMYTH_C_GCC_TRY_FLAGS([-Wpacked], ermyth_cv_c_gcc_w_packed) -ERMYTH_C_GCC_TRY_FLAGS([-Wnested-externs], ermyth_cv_c_gcc_w_nested_externs) -ERMYTH_C_GCC_TRY_FLAGS([-Wbad-function-cast], ermyth_cv_c_gcc_w_bad_function_cast) ERMYTH_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], ermyth_cv_c_gcc_w_unused) ERMYTH_C_GCC_TRY_FLAGS([-Wredundant-decls], ermyth_cv_c_gcc_w_redundant_decls) ERMYTH_C_GCC_TRY_FLAGS([-Wfloat-equal], ermyth_cv_c_gcc_w_float_equal) ERMYTH_C_GCC_TRY_FLAGS([-Wformat=2], ermyth_cv_c_gcc_w_format) ERMYTH_C_GCC_TRY_FLAGS([-Wdisabled-optimization], ermyth_cv_c_gcc_w_format) ERMYTH_C_GCC_TRY_FLAGS([-pedantic], ermyth_cv_c_gcc_pedantic) -ERMYTH_C_GCC_TRY_FLAGS([-std=c89], ermyth_cv_c_gcc_c89) +ERMYTH_C_GCC_TRY_FLAGS([-std=c++98], ermyth_cv_c_gcc_cpp98) dnl Too unreliable to be useful at this time. dnl ERMYTH_C_GCC_TRY_FLAGS([-Wunreachable-code], ermyth_cv_c_gcc_w_unreachable_code) dnl Maintainer flags. -dnl ERMYTH_C_GCC_TRY_FLAGS([-Wconversion], ermyth_cv_c_gcc_w_conversion) +ERMYTH_C_GCC_TRY_FLAGS([-Wconversion], ermyth_cv_c_gcc_w_conversion) ERMYTH_C_GCC_TRY_FLAGS([-Wwrite-strings], ermyth_cv_c_gcc_w_strings) dnl ERMYTH_C_GCC_TRY_FLAGS([-Werror], ermyth_cv_c_gcc_w_error) ]) @@ -677,10 +667,10 @@ echo "Makefile generation" echo +dnl include/common/callback.h AC_OUTPUT([ Makefile doc/Makefile - include/common/callback.h modules/Makefile modules/Makefile.common modules/Makefile.defs