handle libintl-detection differently

4 files changed, 77 insertions, 15 deletions

diff --git a/net/gnapster/files/patch-sum b/net/gnapster/files/patch-sum
index d97946d5644..d6c102d48d6 100644
--- a/net/gnapster/files/patch-sum
+++ b/net/gnapster/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/03/16 00:56:31 wiz Exp $
+$NetBSD: patch-sum,v 1.5 2000/03/16 01:36:06 wiz Exp $
 
 MD5 (patch-aa) = df5bb3daa1712bcd7d182262c5470179
-MD5 (patch-ab) = 870751ed32449e4757286bc04bda9dd3
+MD5 (patch-ac) = 0d3a4183419dda5a212357bb53f9d312
+MD5 (patch-ad) = 50f4fa40d35e563bb37b328d8b9b0ca9
diff --git a/net/gnapster/patches/patch-ab b/net/gnapster/patches/patch-ab
deleted file mode 100644
index b394571aa79..00000000000
--- a/net/gnapster/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/03/16 00:56:32 wiz Exp $
-
---- configure.orig	Wed Mar  1 04:00:12 2000
-+++ configure	Thu Mar 16 01:48:17 2000
-@@ -3669,7 +3669,7 @@
- #include "confdefs.h"
- #include <libintl.h>
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+ac_try="$ac_cpp $CFLAGS conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:3674: \"$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
diff --git a/net/gnapster/patches/patch-ac b/net/gnapster/patches/patch-ac
new file mode 100644
index 00000000000..c555b2e6351
--- /dev/null
+++ b/net/gnapster/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.1 2000/03/16 01:36:08 wiz Exp $
+
+--- configure.orig	Wed Feb 16 03:35:34 2000
++++ configure	Mon Feb 28 06:34:14 2000
+@@ -3658,36 +3658,8 @@
+ 	nls_cv_header_libgt=
+ 	CATOBJEXT=NONE
+ 
+-	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:3664: checking for libintl.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 3669 "configure"
+-#include "confdefs.h"
+-#include <libintl.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3674: \"$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
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
+-echo "configure:3691: checking for gettext in libc" >&5
++	  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
++echo "configure:3663: checking for gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4000,8 +3972,3 @@
+ 	       INTLLIBS=-lintl
+ 	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ 	    fi
+-	
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
diff --git a/net/gnapster/patches/patch-ad b/net/gnapster/patches/patch-ad
new file mode 100644
index 00000000000..939e8e23523
--- /dev/null
+++ b/net/gnapster/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2000/03/16 01:36:08 wiz Exp $
+
+--- aclocal.m4.orig	Sun Feb 13 07:38:19 2000
++++ aclocal.m4	Mon Feb 28 06:34:09 2000
+@@ -1230,8 +1230,7 @@
+ 	nls_cv_header_libgt=
+ 	CATOBJEXT=NONE
+ 
+-	AC_CHECK_HEADER(libintl.h,
+-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
++	  AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+ 	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+ 	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+ 
+@@ -1271,7 +1270,6 @@
+ 	       INTLLIBS=-lintl
+ 	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ 	    fi
+-	])
+ 
+         if test "$CATOBJEXT" = "NONE"; then
+ 	  AC_MSG_CHECKING([whether catgets can be used])