From 759d11fcdbf957d8bb18b34b902c653eeefb9631 Mon Sep 17 00:00:00 2001 From: psychon Date: Wed, 11 Apr 2007 15:19:31 +0000 Subject: [PATCH] Fix which makes --enable-modules enable the modules, not disable them git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@793 726aef4b-f618-498e-8847-2d620e286838 --- configure.in | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index cf2d6977..6450ad3f 100644 --- a/configure.in +++ b/configure.in @@ -47,12 +47,37 @@ fi appendCXX -fPIC -AC_ARG_WITH( openssl, [ --with-openssl=/path/to/openssl], OPENSSL=$withval,) -AC_ARG_ENABLE( debug, [ --enable-debug enable debuging], appendCXX -Wall -ggdb -D_DEBUG, appendCXX -Wall -s -O2 -fomit-frame-pointer ) -AC_ARG_ENABLE( ipv6, [ --enable-ipv6 enable ipv6 support], appendCXX -DHAVE_IPV6,) -AC_ARG_ENABLE( modules, [ --disable-modules disable modules], MODULES="no", MODULES="yes") -AC_ARG_ENABLE( openssl, [ --disable-openssl disable openssl], NOSSL=1,) -AC_ARG_ENABLE( perl, [ --disable-perl disable perl], NOPERL=1,) +AC_ARG_WITH( [openssl], + AC_HELP_STRING([--with-openssl=/path/to/openssl], []), + [OPENSSL=$withval],) +AC_ARG_ENABLE( [debug], + AC_HELP_STRING([--enable-debug], [enable debuging]), + [DEBUG="$enableval"], + [DEBUG="no"]) +AC_ARG_ENABLE( [ipv6], + AC_HELP_STRING([--enable-ipv6], [enable ipv6 support]), + [IPV6="$enableval"], + [IPV6="no"]) +AC_ARG_ENABLE( [modules], + AC_HELP_STRING([--disable-modules], [disable modules]), + [MODULES="$enableval"], + [MODULES="yes"]) +AC_ARG_ENABLE( [openssl], + AC_HELP_STRING([--disable-openssl], [disable openssl]), + [if test "$enableval" = "no" ; then NOSSL=1; fi],) +AC_ARG_ENABLE( [perl], + AC_HELP_STRING([--disable-perl], [disable perl]), + [if test "$enableval" = "no" ; then NOPERL=1; fi],) + +if test "$DEBUG" != "no"; then + appendCXX -Wall -ggdb -D_DEBUG +else + appendCXX -Wall -s -O2 -fomit-frame-pointer +fi + +if test "$IPV6" != "no"; then + appendCXX -DHAVE_IPV6 +fi AC_CHECK_LIB( gnugetopt, getopt_long,) AC_CHECK_FUNCS( stat lstat chmod open, , echo "Missing Required libc feature" && exit 1) @@ -81,7 +106,11 @@ if test -z "$prefix" || test $prefix = "NONE"; then prefix="/usr/local" fi -AC_ARG_WITH( module-prefix, [ --with-module-prefix=/path/to/moduledir], MODDIR=$withval, MODDIR="${prefix}/libexec") +AC_ARG_WITH( [module-prefix], + AC_HELP_STRING([--with-module-prefix=/path/to/moduledir], []), + [MODDIR=$withval], + [MODDIR="${prefix}/libexec"] ) + if test "$MODULES" = "yes"; then if test -z "$NOCHECK_DL"; then AC_CHECK_LIB( dl, dlopen,,MODULES="no",)