blob: 2e55d3779c387f947f6981d0b7bf48cec7f50f21 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
$NetBSD: patch-aa,v 1.3 1999/01/01 02:41:16 garbled Exp $
--- configure.orig Tue Dec 15 20:14:28 1998
+++ configure Thu Dec 31 19:35:27 1998
@@ -1174,6 +1174,7 @@
# Always use our own libtool.
+if false; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -1253,6 +1254,7 @@
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
@@ -1533,6 +1535,7 @@
else
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+ GTK_LIBS=`echo "$GTK_LIBS -lintl"`
gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
@@ -4234,24 +4237,6 @@
else
echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
fi
-
-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4242 "configure"
-#include "confdefs.h"
-#include <png.h>
-PNG_LIBPNG_VER_STRING
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep ""1.0.2"" >/dev/null 2>&1; then
- rm -rf conftest*
- echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit
-else
- rm -rf conftest*
- png_ok=yes
-fi
-rm -f conftest*
echo "$ac_t""$png_ok" 1>&6
|
