blob: 1af3d26ce2ef97274069380ca58dcdf8d5c6eea1 (
plain) (
blame)
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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
$FreeBSD$
--- configure.orig Mon Apr 29 12:07:59 2002
+++ configure Mon Apr 29 12:08:54 2002
@@ -5339,6 +5339,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8775,7 +8776,7 @@
else
save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"
+ LDFLAGS="$LDFLAGS `$GLIB_CONFIG --libs gmodule`"
if test "$cross_compiling" = yes; then
ac_cv_gmodule=yes
else
@@ -10394,7 +10395,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10400 "configure"
#include "confdefs.h"
@@ -13483,13 +13484,13 @@
SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
ART_LIBS="-lart_lgpl"
-GNOME_LIBS="-lgnome -lgnomesupport $LIBGNOME_LIBS"
+GNOME_LIBS="-lgnome -lgnomesupport -lintl $LIBGNOME_LIBS"
GNOMEUI_LIBS="-lgnomeui $ART_LIBS $GDK_IMLIB_LIBS $GTK_LIBS $GNOME_LIBS"
GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
GNOME_LIBDIR='-L${libdir}'
-GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
GNOME_IDLDIR='-I${datadir}/idl'
@@ -13887,6 +13888,7 @@
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
s%@cflags_set@%$cflags_set%g
+s%@GLIB_CONFIG@%$GLIB_CONFIG%g
s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
s%@GTK_LIBS@%$GTK_LIBS%g
@@ -14356,10 +14358,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
# The eval makes quoting arguments work.
|
