From: Alexander Barton <alex@barton.de>
Date: Thu, 27 Dec 2001 00:37:07 +0000 (+0000)
Subject: - Erkennung der "portab header" geaendert, CFLAGS werden nun anders gesetzt.
X-Git-Tag: rel-0-0-1~47
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=6284acf6cadc37fe8c7106aea039181582d9114e;hp=574ae82ca411afb56bb1688ce3c17f254f57522f

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

diff --git a/configure.in b/configure.in
index 5b3b07ba..78536e94 100644
--- 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.
 #
-# $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 $
+# 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".
 #
@@ -40,8 +43,7 @@ AM_CONFIG_HEADER(src/config.h)
 
 # -- Variablen --
 
-CFLAGS="$CFLAGS -I/usr/local/include"
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+CFLAGS="-Wall -g $CFLAGS"
 
 # -- C Compiler --
 
@@ -57,9 +59,15 @@ AC_PROG_RANLIB
 
 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!])
 
diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am
index 86cd5906..204a0113 100644
--- 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 $
+# 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.
 #
@@ -19,8 +22,6 @@
 # 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