- Erkennung der "portab header" geaendert, CFLAGS werden nun anders gesetzt.

diff --git a/configure.in b/configure.in
index 5b3b07ba94bad76f76663cc23c02ec4e18dc0a4f..78536e944654ea27112c06a20f5a3d5872ca2a82 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,12 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
 #

-# $Id: configure.in,v 1.6 2001/12/25 22:01:47 alex Exp $
+# $Id: configure.in,v 1.7 2001/12/27 00:37:07 alex Exp $

 #
 # $Log: configure.in,v $
 #
 # $Log: configure.in,v $

+# Revision 1.7  2001/12/27 00:37:07  alex
+# - Erkennung der "portab header" geaendert, CFLAGS werden nun anders gesetzt.
+#

 # Revision 1.6  2001/12/25 22:01:47  alex
 # - neue configure-Option "--enable-sniffer".
 #
 # Revision 1.6  2001/12/25 22:01:47  alex
 # - neue configure-Option "--enable-sniffer".
 #


@@ -40,8 +43,7 @@ AM_CONFIG_HEADER(src/config.h)
 
 # -- Variablen --
 
 
 # -- Variablen --
 

-CFLAGS="$CFLAGS -I/usr/local/include"
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+CFLAGS="-Wall -g $CFLAGS"

 
 # -- C Compiler --
 
 
 # -- C Compiler --
 


@@ -57,9 +59,15 @@ AC_PROG_RANLIB
 
 AC_HEADER_STDC
 
 
 AC_HEADER_STDC
 

-AC_CHECK_HEADER(portab.h,,AC_MSG_ERROR([Alex \"portability headers\" (portab.h an friends) not found!]))
-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(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([netinet/in.h sys/socket.h],,[required C headers missing!])
 
 
 AC_CHECK_HEADERS([netinet/in.h sys/socket.h],,[required C headers missing!])
 

diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am
index 86cd5906aa2446ac9ed2038ddfdc53e846ca211f..204a0113983f320c8e8f53fc1b283923a9e60d97 100644 (file)
--- a/src/ngircd/Makefile.am
+++ b/src/ngircd/Makefile.am
@@ -1,6 +1,9 @@
-# $Id: Makefile.am,v 1.6 2001/12/23 21:53:54 alex Exp $
+# $Id: Makefile.am,v 1.7 2001/12/27 00:37:07 alex Exp $

 
 # $Log: Makefile.am,v $
 
 # $Log: Makefile.am,v $

+# Revision 1.7  2001/12/27 00:37:07  alex
+# - Erkennung der "portab header" geaendert, CFLAGS werden nun anders gesetzt.
+#

 # Revision 1.6  2001/12/23 21:53:54  alex
 # - Header messages.h eingefuegt.
 #
 # Revision 1.6  2001/12/23 21:53:54  alex
 # - Header messages.h eingefuegt.
 #


@@ -19,8 +22,6 @@
 # Revision 1.1.1.1  2001/12/11 21:53:04  alex
 # - Imported sources to CVS.
 
 # Revision 1.1.1.1  2001/12/11 21:53:04  alex
 # - Imported sources to CVS.
 

-CFLAGS = -Wall -g
-

 sbin_PROGRAMS = ngircd
 
 ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c irc.c log.c parse.c tool.c
 sbin_PROGRAMS = ngircd
 
 ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c irc.c log.c parse.c tool.c