Changeset 47

Timestamp:

24.12.2001 22:20:22 (7 years ago)

Author:

tibob

Message:

IPFM v0.11 from official tarball

Location:

branches/TGZ_SOURCE

Files:

• HISTORY (modified) (1 diff)
• INSTALL (modified) (4 diffs)
• Makefile.common.in (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• TODO (modified) (2 diffs)
• VERSION (modified) (1 diff)
• configure (modified) (42 diffs)
• configure.in (modified) (6 diffs)
• doc/ipfm.conf.man (modified) (6 diffs)
• doc/ipfm.man (modified) (4 diffs)
• ipfm.conf.sample (modified) (1 diff)
• source/Makefile.in (modified) (1 diff)
• source/config.l (modified) (4 diffs)
• source/config.y (modified) (13 diffs)
• source/data.c (modified) (16 diffs)
• source/data.h (modified) (2 diffs)
• source/filter.c (modified) (6 diffs)
• source/filter.h (modified) (1 diff)
• source/init.c (modified) (15 diffs)
• source/init.h (modified) (2 diffs)
• source/ipfm.c (modified) (6 diffs)
• source/pcap.c (modified) (11 diffs)
• source/utils.c (modified) (3 diffs)
• source/utils.h (modified) (2 diffs)

branches/TGZ_SOURCE/HISTORY

@@ +1 @@
+Version 0.11 - 21 October 2000 - Samuel HOCEVAR (sam@via.ecp.fr),
+Robert CHERAMY (tibob@via.ecp.fr)
+------------------------------------------------------------------
+sam :
+- changes to keep respecting the debian policy (sam convinced me to put the
+  /debian directory in the tarball)
+- added counter to avoid going through the logs twice while dumping data
+- ipfm now tires to create a directory if it is unable to create logfile
+- sam checked my bad spelling. I'm ashamed of making so much mistakes ...
+- avoid warning while empty tests (test x$var = "xfoo") in configure.in
+- ability to fix an exact time origin and offset while logging.
+  Default offset is 0;
+- cumulative stats
+- added PID file handling when running in daemon mode.
+tibob :
+- put options that didn't belong into the Makefile (and in the gcc line) in
+  source/config.h.in. Lines are more readable at compile time.
+- check if inet_aton exists. otherwise, uses old inet_addr method.
+- removed a shift/reduce conflict in the yacc grammar
+- A line of information is displayed in each logfile
+- snprinf is now mandatory to use ipfm. People can cange snprintf to printf
+  if they want; at their own risk.
+- replaced TIME Date [ALIGN Date] by DUMP EVERY Date AFTER Date
+- added CLEAR EVERY Date AFTER Date
+- SigUsr1 dumps data to disk without clearing buffers.
+
 Version 0.10.4 - 17 October 1999 - Andres KRAPF and Robert CHERAMY
 ------------------------------------------------------------------

branches/TGZ_SOURCE/INSTALL

@@ -1 +1 @@
 IPFM is designed to work on every un*x system.
-It was tested under Linux libc5 and libc6, FreeBSD, OpenBSD, IRIX, and should
-work on AIX (please let us know if you tried other OSes)
+IPFM is developed under Linux libc6 (Debian woody).
+It was reported to work under Linux libc5 (slackware) and libc6 (RedHat,
+SuSE), FreeBSD, OpenBSD, IRIX, and AIX.
+As we can't test new versions under these OSes, there might be problems. Please
+report them at ipfm@via.ecp.fr.
 
 Requirements
@@ -19 +22 @@
 Here are the options used to build the Debian GNU/Linux package for example:
 
-        ./configure --prefix=/usr
+        ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
 
 Notes
 -----
-1. Local libpcap instalation
+1. Local libpcap installation
   If ipfm and libpcap are installed in the same directory, (DIR/ipfm* and
   DIR/libpcap*) ipfm will use this local pcap library (you don't need to
@@ -37 +40 @@
   RedHat does), please let us know at ipfm@via.ecp.fr, so we can add it in
   future versions.
-  To make it compile before the new version is released, you have to change
+  To make it compile before a new version is released, you have to change
   the file source/Makefile, and set the line "INCLS =" to
   INCLS = -I/directory/holding/pcap/header/
@@ -46 +49 @@
   correctly installed.
 
-5. You must be root...
+5. You must be root ...
   * to install ipfm packages (.rpm and .deb)
   * to run ipfm
 
 For any questions, remarks, requests, you can join us at ipfm@via.ecp.fr
---
-Robert CHERAMY <tibob@via.ecp.fr>
-Andres KRAPF <dae@via.ecp.fr>

branches/TGZ_SOURCE/Makefile.common.in

@@ -14 +14 @@
 ETCDIR  = $(ROOT)@sysconfdir@
 LOGDIR  = $(ROOT)/var/log
+VARRUN  = $(ROOT)/var/run
 
 INSTALL = @INSTALL@
@@ -22 +23 @@
 LEX  = @LEX@
 
-CONFIGURATION_FILE=$(ETCDIR)/ipfm.conf
-LOG_FILE=$(LOGDIR)/ipfm/%d-%b.%H-%M
-TIME_INTERVAL='24*60*60'
+CONFIGFILE=$(ETCDIR)/ipfm.conf
+LOGFILE=$(LOGDIR)/ipfm/%d-%b.%H-%M
+PIDFILE=$(VARRUN)/ipfm.pid
 

branches/TGZ_SOURCE/Makefile.in

@@ -18 +18 @@
         $(INSTALL) -m 755 source/ipfm $(SBINDIR)/ipfm
         $(INSTALL) -d -m 755 $(ETCDIR)
-        [ -f $(CONFIGURATION_FILE) ] || \
-          $(INSTALL) -m 644 ipfm.conf.sample $(CONFIGURATION_FILE)
+        [ -f $(CONFIGFILE) ] || \
+          $(INSTALL) -m 644 ipfm.conf.sample $(CONFIGFILE)
         $(INSTALL) -d -m 755 $(MANDIR)/man5
         $(INSTALL) -d -m 755 $(MANDIR)/man8
@@ -33 +33 @@
         $(RM) config.cache config.log config.status \
           Makefile Makefile.common *~ core \
-          source/Makefile source/*~ source/core \
+          source/Makefile source/*~ source/core source/config.h \
           doc/Makefile doc/*~
 
@@ -40 +40 @@
         echo "   ipfm is in               @sbindir@" && \
         echo "   man pages are in         @mandir@" && \
-        echo "   configuration file is    $(CONFIGURATION_FILE)" && \
-        echo "   log files are            $(LOG_FILE)"
+        echo "   configuration file is    $(CONFIGFILE)" && \
+        echo "   pid file is              $(PIDFILE)" && \
+        echo "   log files are            $(LOGFILE)"
 

branches/TGZ_SOURCE/TODO

@@ -1 @@
-* Make old ANSI-only compilers support logs bigger than 4GB (will be done
-only if there is a user request)
-
-* add a warning in TestLogs() for redundant file names / possibility to append file.
-
-* implement dns caching
-
-* port log
+* log by selecting protocol (TCP/UDP) and port
 [NOT] PORT nb|<nb|>nb|all
 * Type (can be cumulative)
 TYPE TCP|UDP|ICMP
 
-* file keeping the logs to prevent loosing data if machine is rebooted ?
-
 ***** Rewrite output to accept modules ******
 * be able to configure the output file format.
-
-* Include date in output file
-
-* Output On which network interface ipfm logs in log file.
 
 * Output Bandwidth (bps) instead of bytes in log file.
@@ -27 +14 @@
 
 * HTML output
-* CISCO accounting process compatible format : host source totaltrafic numberofpacket
+* CISCO accounting process compatible format : host source total_trafic number_of_packet
+
+
+

branches/TGZ_SOURCE/VERSION

@@ -1 @@
-0.10.4
+0.11

branches/TGZ_SOURCE/configure

@@ -523 +523 @@
 
 
+
 VERSION=`cat $srcdir/VERSION`
 
@@ -532 +533 @@
 set dummy uname; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:535: checking for $ac_word" >&5
+echo "configure:536: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_UNAME'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -566 +567 @@
 
 echo $ac_n "checking your OS""... $ac_c" 1>&6
-echo "configure:569: checking your OS" >&5
+echo "configure:570: checking your OS" >&5
 system=`$UNAME`
 case $system in
@@ -595 +596 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:598: checking for $ac_word" >&5
+echo "configure:599: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -625 +626 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:628: checking for $ac_word" >&5
+echo "configure:629: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -676 +677 @@
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:679: checking for $ac_word" >&5
+echo "configure:680: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -708 +709 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:711: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -719 +720 @@
 cat > conftest.$ac_ext << EOF
 
-#line 722 "configure"
+#line 723 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -750 +751 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:754: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:758: checking whether we are using GNU C" >&5
+echo "configure:759: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -764 +765 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -783 +784 @@
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:786: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:787: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -819 +820 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:822: checking for $ac_word" >&5
+echo "configure:823: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -852 +853 @@
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:855: checking for $ac_word" >&5
+echo "configure:856: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -886 +887 @@
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:889: checking for yywrap in -l$ac_lib" >&5
+echo "configure:890: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -894 +895 @@
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 897 "configure"
+#line 898 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -905 +906 @@
 ; return 0; }
 EOF
-if { (eval echo configure:908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -958 +959 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:961: checking for a BSD compatible install" >&5
+echo "configure:962: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -1013 +1014 @@
 
 echo $ac_n "checking for local libpcap""... $ac_c" 1>&6
-echo "configure:1016: checking for local libpcap" >&5
+echo "configure:1017: checking for local libpcap" >&5
 pcapdirs=`ls .. | grep libpcap | sed -e 's:/$::' -e 's:^:../:' | tr '\n' ' '`
 libpcap=FAIL
@@ -1026 +1027 @@
 done
 
-if test $libpcap = FAIL ; then
+if test "x$libpcap" = "xFAIL" ; then
   echo "$ac_t""no" 1>&6
   echo $ac_n "checking for main in -lpcap""... $ac_c" 1>&6
-echo "configure:1032: checking for main in -lpcap" >&5
+echo "configure:1033: checking for main in -lpcap" >&5
 ac_lib_var=`echo pcap'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1037 +1038 @@
 LIBS="-lpcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1040 "configure"
+#line 1041 "configure"
 #include "confdefs.h"
 
@@ -1044 +1045 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1067 +1068 @@
   pcapdir=""
     echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1070: checking how to run the C preprocessor" >&5
+echo "configure:1071: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1082 +1083 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1085 "configure"
+#line 1086 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1088 +1089 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1099 +1100 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1102 "configure"
+#line 1103 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1105 +1106 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1116 +1117 @@
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1119 "configure"
+#line 1120 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1122 +1123 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1148 +1149 @@
 ac_safe=`echo "pcap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pcap.h""... $ac_c" 1>&6
-echo "configure:1151: checking for pcap.h" >&5
+echo "configure:1152: checking for pcap.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1157 "configure"
 #include "confdefs.h"
 #include <pcap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1180 +1181 @@
 fi
 
-  if test $NO_PCAP_H = 1; then
+  if test "x$NO_PCAP_H" = "x1"; then
     echo $ac_n "checking for exotic pcap.h places""... $ac_c" 1>&6
-echo "configure:1185: checking for exotic pcap.h places" >&5
+echo "configure:1186: checking for exotic pcap.h places" >&5
     if test -r /usr/include/pcap/pcap.h; then
       INCLS="$INCLS -I/usr/include/pcap"
@@ -1198 +1199 @@
 
 
-if test $CC = "gcc" ; then
+if test "x$CC" = "xgcc" ; then
   WARNINGS="-Wall"
   
@@ -1206 +1207 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1209: checking for $ac_func" >&5
+echo "configure:1210: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1214 "configure"
+#line 1215 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1234 +1235 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -1262 +1263 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_func" >&5
+echo "configure:1266: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1270 "configure"
+#line 1271 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1290 +1291 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -1318 +1319 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1321: checking for $ac_func" >&5
+echo "configure:1322: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1326 "configure"
+#line 1327 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1346 +1347 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -1367 +1368 @@
 else
   echo "$ac_t""no" 1>&6
+{ echo "configure: error: You need snprintf in order to use ipfm" 1>&2; exit 1; }
 fi
 done
 
 
-sysconfdir=/etc
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
 
 trap '' 1 2 15
@@ -1436 +1442 @@
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[     `~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
+DEFS=-DHAVE_CONFIG_H
 
 # Without the "./", some shells look in PATH for config.status.
@@ -1486 +1480 @@
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile Makefile.common source/Makefile doc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile Makefile.common source/Makefile doc/Makefile source/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1630 +1624 @@
 rm -f conftest.s*
 
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s%^\([   ]*\)#\([        ]*define[       ][      ]*\)'
+ac_dB='\([      ][      ]*\)[^  ]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
+ac_uB='\([      ]\)%\1#\2define\3'
+ac_uC=' '
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
+
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="source/config.h"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
+
+EOF
+
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.