Broken change to lib/interfaces.c in last night's 2_2 CVS - Fix Enclosed - Fixed for real this time !?!

[Richard Bollinger]

Oops -- sorry... That changes compiles OK, but NOT if you rerun configure!!!  Here's config.log:

configure:10972: checking for iface AIX
configure:10989: gcc -o conftest -O -g 
conftest.c  -ldl 1>&5
In file included from configure:10986:
./lib/interfaces.c:34: config.h: No such file or directory
configure: failed program was:
#line 10981 "configure"
#include "confdefs.h"

#define HAVE_IFACE_AIX 1
#define AUTOCONF_TEST 1
#include "confdefs.h"
#include "./lib/interfaces.c"
configure:11013: checking for iface ifconf
configure:11030: gcc -o conftest -O -g 
conftest.c  -ldl 1>&5
In file included from configure:11027:
./lib/interfaces.c:34: config.h: No such file or directory
configure: failed program was:
#line 11022 "configure"
#include "confdefs.h"

#define HAVE_IFACE_IFCONF 1
#define AUTOCONF_TEST 1
#include "confdefs.h"
#include "./lib/interfaces.c"
configure:11055: checking for iface ifreq
configure:11072: gcc -o conftest -O -g 
23   conftest.c  -ldl 1>&5
In file included from configure:11069:
./lib/interfaces.c:34: config.h: No such file or directory
In file included from configure:11069:
./lib/interfaces.c:159: sys/stropts.h: No such file or directory
configure: failed program was:
#line 11064 "configure"
#include "confdefs.h"

#define HAVE_IFACE_IFREQ 1
#define AUTOCONF_TEST 1
#include "confdefs.h"
#include "./lib/interfaces.c"

Looks like the include needs to be wrapped in ifndef 
--- ../source/lib/interfaces.c Tue Jun  4 07:46:46 2002
+++ ./lib/interfaces.c Tue Jun  4 12:58:15 2002
@@ -31,6 +31,10 @@
 
 */
 
+#ifndef AUTOCONF_TEST
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -57,7 +61,6 @@
  struct in_addr netmask;
 };
 #else
-#include "config.h"
 #include "interfaces.h"
 #endif


Rich Bollinger

----- Original Message ----- 
From: "Green, Paul" <Paul.Green at stratus.com>
To: "'Richard Bollinger'" <rabollinger at attbi.com>; "Samba Technical" <samba-technical at samba.org>
Sent: Tuesday, June 04, 2002 11:24 AM
Subject: RE: Broken change to lib/interfaces.c in last night's 2_2 CVS - Fix Enclosed


> Mea culpa. Thanks, Rich. 
> 
> PG
> 
> Richard Bollinger [mailto:rabollinger at attbi.com] writes:
> > Problem is that there are ifdef tests depending on the 
> > contents of config.h before it's included.
> > This patch moves up that include to the beginning:
>