Fix configure script to first determine if we are on a bigendian system or

not, and only then set the corresponding variables.
Addresses pkg/9803.

3 files changed, 78 insertions, 15 deletions

diff --git a/net/xipdump/files/patch-sum b/net/xipdump/files/patch-sum
index 00aa3224460..de4b78fad76 100644
--- a/net/xipdump/files/patch-sum
+++ b/net/xipdump/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/11/16 23:52:28 sakamoto Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/09 19:23:24 wiz Exp $
 
-MD5 (patch-aa) = eee0c7edc19a3269fc8f577278255b28
-MD5 (patch-ab) = a4bf2de800143f505b6e9e8ffd9fe944
+MD5 (patch-aa) = 2ee3c62b073a4a0c3bc8bfe9ce240ea4
+MD5 (patch-ab) = 15933bb31dbb82263e6901162a2071bf
 MD5 (patch-ac) = e549730103a23ab222f393bef856118c
diff --git a/net/xipdump/patches/patch-aa b/net/xipdump/patches/patch-aa
index 4c69cb5789f..9172bd8b6ae 100644
--- a/net/xipdump/patches/patch-aa
+++ b/net/xipdump/patches/patch-aa
@@ -1,17 +1,43 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/15 02:29:51 sakamoto Exp $
+$NetBSD: patch-aa,v 1.2 2000/09/09 19:23:25 wiz Exp $
 
---- ./configure.in.orig	Fri Nov 12 12:56:10 1999
-+++ ./configure.in	Mon Nov 15 10:06:16 1999
-@@ -56,4 +56,6 @@
+--- configure.in.orig	Wed Dec 22 09:50:40 1999
++++ configure.in
+@@ -55,6 +55,8 @@
+ 	LDFLAGS="$LDFLAGS -L$PCAP_LIBPATH"
  fi
  
 +if false
 +then
  MG_LIBNET(LIBNET_DEP,LIBNET_INCLPATH,LIBNET_LIBPATH)
  if test "x$LIBNET_INCLPATH" != "x"
-@@ -64,4 +66,5 @@
+ then
+@@ -64,14 +66,8 @@
  then
  	LDFLAGS="$LDFLAGS -L$LIBNET_LIBPATH"
-+fi
  fi
+-
+-dnl Extra defines for libnet
+-if test "x$ac_cv_c_bigendian" = "xyes"; then
+-       AC_DEFINE(LIBNET_BIG_ENDIAN)
+-else
+-       AC_DEFINE(LIBNET_LIL_ENDIAN)
+ fi
+-       
++
+ dnl Determine if -lsocket or -lnsl are needed.
+ dnl On some platforms (Irix) libnsl and libsocket should not be used.
+ AC_CHECK_FUNCS(gethostbyname getservbyname)
+@@ -111,6 +107,13 @@
+ FP_C_PROTOTYPES
+ MG_C_ANSI_CPP
  
++dnl Extra defines for libnet
++if test "x$ac_cv_c_bigendian" = "xyes"; then
++       AC_DEFINE(LIBNET_BIG_ENDIAN)
++else
++       AC_DEFINE(LIBNET_LIL_ENDIAN)
++fi
++       
+ dnl
+ dnl library functions
+ dnl
diff --git a/net/xipdump/patches/patch-ab b/net/xipdump/patches/patch-ab
index 8ce36488daa..cc0d47a2095 100644
--- a/net/xipdump/patches/patch-ab
+++ b/net/xipdump/patches/patch-ab
@@ -1,17 +1,54 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/15 02:29:51 sakamoto Exp $
+$NetBSD: patch-ab,v 1.2 2000/09/09 19:23:25 wiz Exp $
 
---- ./configure.orig	Fri Nov 12 12:56:19 1999
-+++ ./configure	Mon Nov 15 10:06:16 1999
-@@ -1361,4 +1361,6 @@
+--- configure.orig	Wed Dec 22 09:51:48 1999
++++ configure
+@@ -1360,8 +1360,10 @@
+ 	LDFLAGS="$LDFLAGS -L$PCAP_LIBPATH"
  fi
  
 +if false
 +then
  echo $ac_n "checking for local libnet library""... $ac_c" 1>&6
  echo "configure:1365: checking for local libnet library" >&5
-@@ -1389,4 +1391,5 @@
+     libnet=FAIL
+     lastdir=FAIL
+     places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \
+@@ -1389,18 +1391,7 @@
  then
  	LDFLAGS="$LDFLAGS -L$LIBNET_LIBPATH"
-+fi
  fi
+-
+-if test "x$ac_cv_c_bigendian" = "xyes"; then
+-       cat >> confdefs.h <<\EOF
+-#define LIBNET_BIG_ENDIAN 1
+-EOF
+-
+-else
+-       cat >> confdefs.h <<\EOF
+-#define LIBNET_LIL_ENDIAN 1
+-EOF
+-
+ fi
+-       
++
+ for ac_func in gethostbyname getservbyname
+ do
+@@ -1877,6 +1868,18 @@
+ fi
+ 
+ 
++if test "x$ac_cv_c_bigendian" = "xyes"; then
++       cat >> confdefs.h <<\EOF
++#define LIBNET_BIG_ENDIAN 1
++EOF
++
++else
++       cat >> confdefs.h <<\EOF
++#define LIBNET_LIL_ENDIAN 1
++EOF
++
++fi
++       
  
+ for ac_func in bzero bcopy bcmp strdup qsort snprintf usleep strerror strtol strtoul dlopen scandir
+ do