X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=3a4a445b8703b12045e8236771baa117e97e0a38;hp=dc0e0f890e958d5c6e3e2d4a8f45bd98e341db3b;hb=40c9f5c332c837721041f14aab2a596a73f8efb9;hpb=50352dc93b2f450581422738ffc36a1e7528df84

diff --git a/configure.in b/configure.in
index dc0e0f89..3a4a445b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,17 +1,62 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
 #
 # Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
 # der GNU General Public License (GPL), wie von der Free Software Foundation
 # herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
 # der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
-# der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
+# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: configure.in,v 1.8 2001/12/27 01:44:49 alex Exp $
+# $Id: configure.in,v 1.23 2002/01/29 01:07:15 alex Exp $
 #
 # $Log: configure.in,v $
+# Revision 1.23  2002/01/29 01:07:15  alex
+# - Version auf 0.1.1-pre im CVS angehoben.
+#
+# Revision 1.22  2002/01/29 00:24:17  alex
+# - Version 0.0.1
+#
+# Revision 1.21  2002/01/16 23:06:16  alex
+# - Version auf 0.0.4-pre im CVS angehoben.
+#
+# Revision 1.20  2002/01/16 22:55:45  alex
+# - Version 0.0.3
+#
+# Revision 1.19  2002/01/06 16:21:09  alex
+# - CVS-Version auf "0.0.3-pre" angehoben.
+#
+# Revision 1.18  2002/01/06 16:09:37  alex
+# - Version 0.0.2
+#
+# Revision 1.17  2002/01/05 15:53:20  alex
+# - Test auf Header "arpa/inet.h" und Funktion inet_aton() hinzugefuegt (BeOS).
+#
+# Revision 1.16  2002/01/02 13:41:36  alex
+# - CFLAGS wird nur noch gesetzt, wenn der GCC verwendet wird.
+#
+# Revision 1.15  2002/01/02 02:52:09  alex
+# - Copyright-Texte angepasst ;-)
+#
+# Revision 1.14  2001/12/31 16:11:13  alex
+# - CVS-Version auf "0.0.2-pre" angehoben.
+#
+# Revision 1.13  2001/12/31 16:02:30  alex
+# - Version 0.0.1
+#
+# Revision 1.12  2001/12/31 02:21:00  alex
+# - "doc"-Unterverzeichnis aufgenommen.
+#
+# Revision 1.11  2001/12/29 03:04:06  alex
+# - neue configure-Option "--enable-strict-rfc".
+#
+# Revision 1.10  2001/12/27 16:25:36  alex
+# - neue configure-Option "--with-portab=DIR".
+#
+# Revision 1.9  2001/12/27 02:08:38  alex
+# - da fehlte an zwei Stellen ein AC_MSG_ERROR ... ups!
+#
 # Revision 1.8  2001/12/27 01:44:49  alex
 # - die Verwendung von syslog kann nun abgeschaltet werden.
 #
@@ -41,13 +86,11 @@
 
 AC_INIT
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
-AM_INIT_AUTOMAKE(ngircd,0.0.1-pre)
+AM_INIT_AUTOMAKE(ngircd,0.1.1-pre)
 AM_CONFIG_HEADER(src/config.h)
 
 # -- Variablen --
 
-CFLAGS="-Wall -g $CFLAGS"
-
 # -- C Compiler --
 
 AC_PROG_CC
@@ -67,20 +110,37 @@ AC_HEADER_STDC
 
 AC_HEADER_TIME
 
-AC_CHECK_HEADER(portab.h,[
-	AC_CHECK_HEADER(imp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-	AC_CHECK_HEADER(exp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-],[
-	AC_CHECK_HEADER(/usr/local/include/portab.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-	AC_CHECK_HEADER(/usr/local/include/imp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-	AC_CHECK_HEADER(/usr/local/include/exp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-	CFLAGS="$CFLAGS -I/usr/local/include"
-])
+AC_ARG_WITH(portab,
+	[  --with-portab=DIR       search the "portab headers" in DIR],
+	[	if test "x$withval" != "xno"; then
+			CFLAGS="$CFLAGS -I${withval}"
+			if test -f ${withval}/portab.h; then
+				AC_MSG_RESULT([searching "portab headers" in ${withval}...])
+			else
+				AC_MSG_ERROR([${withval}/portab.h not found!])
+			fi
+		else
+			AC_MSG_ERROR([Can't disable Alex \"portability headers\"!])
+		fi
+	],
+	[	AC_CHECK_HEADER(portab.h,[
+			AC_CHECK_HEADER(imp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
+			AC_CHECK_HEADER(exp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
+		],[
+			AC_CHECK_HEADER(/usr/local/include/portab.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
+			AC_CHECK_HEADER(/usr/local/include/imp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
+			AC_CHECK_HEADER(/usr/local/include/exp.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
+			CFLAGS="$CFLAGS -I/usr/local/include"
+		])
+	]
+)
 
 AC_CHECK_HEADERS([ \
-	arpa/inet.h errno.h fcntl.h netinet/in.h stdint.h string.h \
+	errno.h fcntl.h netinet/in.h string.h \
 	sys/socket.h sys/time.h unistd.h \
-	],,[required C header missing!])
+	],,AC_MSG_ERROR([required C header missing!]))
+
+AC_CHECK_HEADERS(arpa/inet.h)
 
 # -- Datentypen --
 
@@ -103,8 +163,10 @@ AC_FUNC_MALLOC
 
 AC_CHECK_FUNCS([ \
 	gethostname inet_ntoa memmove memset select \
-	socket strcasecmp strchr strerror strstr \
-	],,[required function missing!])
+	socket strcasecmp strchr strerror strstr waitpid \
+	],,AC_MSG_ERROR([required function missing!]))
+
+AC_CHECK_FUNCS(inet_aton)
 
 # -- Libraries --
 
@@ -122,26 +184,47 @@ AC_ARG_ENABLE(syslog,
 	]
 )
 
-AC_ARG_ENABLE(debug,
-	[  --enable-debug          show additional debug output],
+AC_ARG_ENABLE(strict-rfc,
+	[  --enable-strict-rfc     strict RFC conformance, may break clients],
 	if test "$enableval" = "yes"; then
-		AC_DEFINE(DEBUG, 1)
-		AC_MSG_RESULT([enabling additional debug output])
+		AC_DEFINE(STRICT_RFC, 1)
+		AC_MSG_RESULT([enabling strict RFC conformance])
 	fi
 )
 
 AC_ARG_ENABLE(sniffer,
 	[  --enable-sniffer        enable network traffic monitor (enables debug mode!)],
 	if test "$enableval" = "yes"; then
-		AC_DEFINE(DEBUG, 1)
-		AC_MSG_RESULT([enabling additional debug output])
 		AC_DEFINE(SNIFFER, 1)
 		AC_MSG_RESULT([enabling network traffic monitor])
+		x_debug_on=yes
 	fi
 )
 
+AC_ARG_ENABLE(debug,
+	[  --enable-debug          show additional debug output],
+	if test "$enableval" = "yes"; then x_debug_on=yes; fi
+)
+if test "$x_debug_on" = "yes"; then
+	AC_DEFINE(DEBUG, 1)
+	AC_MSG_RESULT([enabling additional debug output])
+fi
+
+# -- Variablen II --
+
+if test "$GCC" = "yes"; then
+	CFLAGS="-Wall $CFLAGS"
+fi
+
 # -- Ausgabe --
 
-AC_OUTPUT([Makefile MacOSX/Makefile src/Makefile src/ngircd/Makefile])
+AC_OUTPUT([ \
+	Makefile \
+	doc/Makefile \
+	MacOSX/Makefile \
+	MacOSX/ngircd.pbproj/Makefile \
+	src/Makefile \
+	src/ngircd/Makefile \
+])
 
 # -eof-