have -lintl when we check if libintl is from GNU gettext or not.

(bug in gettext.m4)
This commit is contained in:
itojun 2000-11-03 00:15:48 +00:00
parent 01f667c567
commit 8c0ed400a0
5 changed files with 31 additions and 38 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2000/11/02 01:56:14 itojun Exp $
# $NetBSD: Makefile,v 1.18 2000/11/03 00:15:48 itojun Exp $
#
DISTNAME= xtraceroute-0.8.14
@ -11,11 +11,11 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.dtek.chalmers.se/~d3august/xt/index.html
BUILD_DEPENDS+= msgfmt:../../devel/gettext
DEPENDS+= gtkglarea-1.2.1:../../x11/gtkglarea
DEPENDS+= tiff-*:../../graphics/tiff
#DEPENDS+= gtkglarea-1.2.1:../../x11/gtkglarea
#DEPENDS+= tiff-*:../../graphics/tiff
USE_X11= yes
USE_MESA= yes
#USE_MESA= yes
GNU_CONFIGURE= yes
USE_LIBINTL= yes

View file

@ -1,4 +1,4 @@
$NetBSD: md5,v 1.4 1999/12/15 21:34:05 windsor Exp $
$NetBSD: md5,v 1.5 2000/11/03 00:15:48 itojun Exp $
MD5 (xtraceroute-0.8.14.tar.gz) = c4f16fecae49b8bfa2a9bc9b036aa442
MD5 (ndg_files.tar.gz) = 0e2d6ab6a780b49acbd8f706840380d9

View file

@ -1,4 +1,5 @@
$NetBSD: patch-sum,v 1.2 2000/04/05 20:56:03 tron Exp $
$NetBSD: patch-sum,v 1.3 2000/11/03 00:15:48 itojun Exp $
MD5 (patch-aa) = 4c66476c2bd02eaa924e1b349abd1ee4
MD5 (patch-ab) = 125152054ce056093fe27c018d40ca1b
MD5 (patch-ab) = e6a404b36eaec58f504323de1191456f
MD5 (patch-ac) = 723c33389d6a3370d200fbc68b686fce

View file

@ -1,58 +1,40 @@
$NetBSD: patch-ab,v 1.4 2000/04/05 20:56:03 tron Exp $
$NetBSD: patch-ab,v 1.5 2000/11/03 00:15:49 itojun Exp $
--- configure.orig Sun Feb 28 05:56:14 1999
+++ configure Wed Apr 5 22:53:00 2000
@@ -3422,14 +3422,14 @@
fi
--- configure- Fri Nov 3 09:13:56 2000
+++ configure Fri Nov 3 09:13:58 2000
@@ -2310,2 +2310,3 @@
gt_cv_func_gettext_libintl=yes
+ LIBS="$LIBS -lintl"
else
@@ -3424,4 +3425,4 @@
-echo $ac_n "checking for glBegin in -lMesaGL""... $ac_c" 1>&6
-echo "configure:3427: checking for glBegin in -lMesaGL" >&5
+echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
+echo "configure:3427: checking for glBegin in -lGL" >&5
ac_lib_var=`echo MesaGL'_'glBegin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3431,3 +3432,3 @@
ac_save_LIBS="$LIBS"
-LIBS="-lMesaGL $GTK_LIBS $GL_LDOPTS $LIBS"
+LIBS="-lGL $GTK_LIBS $GL_LDOPTS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3435 "configure"
#include "confdefs.h"
@@ -3554,7 +3554,7 @@
elif test "x$with_lib_MesaGL" = "xyes"; then
@@ -3556,3 +3557,3 @@
if test "x$have_MesaGL" = "xyes"; then
- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL"
+ GL_LIBS="$GL_LDOPTS -lGLU -lGL"
else
{ echo "configure: error: Missing MesaGL library" 1>&2; exit 1; }
fi
@@ -3564,7 +3564,7 @@
if test "x$have_GL" = "xyes"; then
GL_LIBS="$GL_LDOPTS -lGLU -lGL"
@@ -3566,3 +3567,3 @@
elif test "x$have_MesaGL" = "xyes"; then
- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL"
+ GL_LIBS="$GL_LDOPTS -lGLU -lGL"
else
{ echo "configure: error: You need GL or MesaGL libraries" 1>&2; exit 1; }
fi
@@ -3630,7 +3630,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3632,3 +3633,3 @@
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $LIBS"
+LIBS="-ltiff -ljpeg -lz $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3636 "configure"
#include "confdefs.h"
@@ -3666,7 +3666,7 @@
if test "x$have_libtiff" = "x" ; then
{ echo "configure: error: Missing tiff library" 1>&2; exit 1; }
@@ -3668,3 +3669,3 @@
else
- LIBS="$LIBS -ltiff"
+ LIBS="$LIBS -ltiff -ljpeg -lz"
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

View file

@ -0,0 +1,10 @@
$NetBSD: patch-ac,v 1.1 2000/11/03 00:15:49 itojun Exp $
--- aclocal.m4- Sun Feb 28 13:56:12 1999
+++ aclocal.m4 Fri Nov 3 09:13:10 2000
@@ -178,3 +178,4 @@
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes
+ LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],