Enhanced configure script: now you can pass an (optional) search path

to all --with-XXX parameters, e. g. "--with-ident=/opt/ident".

diff --git a/ChangeLog b/ChangeLog
index c6b4b5ba8c2b266a707c6e61e7c9b7aa220e2843..66c525fc3c3dd2a904b0ead1c421f00db127561e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
 
 
 ngIRCd CVSHEAD
+  - Enhanced configure script: now you can pass an (optional) search path
+    to all --with-XXX parameters, e. g. "--with-ident=/opt/ident".
   - Removed typedefs for the native C datatypes.
     Use stdbool.h / inttypes.h if available.
   - New configuration option "OperServerMode" to enable a workaround needed
@@ -594,4 +596,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.265 2005/03/19 18:53:16 fw Exp $
+$Id: ChangeLog,v 1.266 2005/03/20 17:23:36 alex Exp $

diff --git a/configure.in b/configure.in
index 695a42ccfc8d976756dc850a08773cb5612d666b..62617bdd2d2ba2cc39df7cce36b3749334dd7c82 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.106 2005/03/19 18:43:48 fw Exp $
+# $Id: configure.in,v 1.107 2005/03/20 17:23:36 alex Exp $
 #
 
 # -- Initialisation --
@@ -132,7 +132,12 @@ AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
 x_syslog_on=no
 AC_ARG_WITH(syslog,
        [  --without-syslog        disable syslog (autodetected by default)],
-       [       if test "$withval" = "yes"; then
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
                        AC_CHECK_LIB(be, syslog)
                        AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
                                AC_MSG_ERROR([Can't enable syslog!])
@@ -152,7 +157,12 @@ fi
 x_zlib_on=no
 AC_ARG_WITH(zlib,
        [  --without-zlib          disable zlib compression (autodetected by default)],
-       [       if test "$withval" = "yes"; then
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
                        AC_CHECK_LIB(z, deflate)
                        AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
                                AC_MSG_ERROR([Can't enable zlib!])
@@ -171,8 +181,13 @@ fi
 x_tcpwrap_on=no
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
-       [       if test "$withval" = "yes"; then
-                       AC_CHECK_LIB(wrap, tcpd_warn)
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+                       AC_CHECK_LIB(wrap, hosts_access)
                        AC_MSG_CHECKING(for hosts_access)
                        AC_TRY_LINK([
                                #include <tcpd.h>
@@ -194,7 +209,12 @@ AC_ARG_WITH(tcp-wrappers,
 x_rendezvous_on=no
 AC_ARG_WITH(rendezvous,
        [  --with-rendezvous       enable support for "Rendezvous"],
-       [       if test "$withval" = "yes"; then
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
                        AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=osx,
                        [
                                AC_CHECK_LIB(pthread, pthread_mutexattr_init)
@@ -219,7 +239,7 @@ if test "$x_rendezvous_on" = "howl"; then
                if test -f "$dir/rendezvous/rendezvous.h"; then
                        if test "$dir" != "/usr/local/include" -a \
                         "$dir" != "/usr/include"; then
-                               CFLAGS="$CFLAGS -I$dir"
+                               CFLAGS="-I$dir $CFLAGS"
                                CPPFLAGS="-I$dir $CPPFLAGS"
                        fi
                        AC_MSG_RESULT(yes)
@@ -236,7 +256,12 @@ fi
 x_identauth_on=no
 AC_ARG_WITH(ident,
        [  --with-ident            enable "IDENT" ("AUTH") protocol support],
-       [       if test "$withval" = "yes"; then
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
                        AC_CHECK_LIB(ident, ident_id)
                        AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
                                AC_MSG_ERROR([Can't enable IDENT support!])