2002-04-29 17:05:43 +00:00
|
|
|
--- 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 @@
|
2001-08-22 18:06:36 +00:00
|
|
|
else
|
|
|
|
|
|
2002-01-15 16:12:51 +00:00
|
|
|
save_LDFLAGS="$LDFLAGS"
|
2001-08-22 18:06:36 +00:00
|
|
|
- LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"
|
|
|
|
|
+ LDFLAGS="$LDFLAGS `$GLIB_CONFIG --libs gmodule`"
|
|
|
|
|
if test "$cross_compiling" = yes; then
|
|
|
|
|
ac_cv_gmodule=yes
|
|
|
|
|
else
|
2002-04-29 17:05:43 +00:00
|
|
|
@@ -10394,7 +10395,7 @@
|
1999-01-04 08:43:09 +00:00
|
|
|
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
|
2002-01-15 16:12:51 +00:00
|
|
|
#line 10400 "configure"
|
1999-01-04 08:43:09 +00:00
|
|
|
#include "confdefs.h"
|
2002-04-29 17:05:43 +00:00
|
|
|
@@ -13483,13 +13484,13 @@
|
1999-06-08 22:03:48 +00:00
|
|
|
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"
|
1999-03-09 01:13:40 +00:00
|
|
|
ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
|
1999-01-01 02:47:12 +00:00
|
|
|
|
|
|
|
|
GNOME_LIBDIR='-L${libdir}'
|
2002-01-15 16:12:51 +00:00
|
|
|
-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'
|
1999-01-01 02:47:12 +00:00
|
|
|
GNOME_IDLDIR='-I${datadir}/idl'
|
1998-09-06 06:34:19 +00:00
|
|
|
|
|
|
|
|
|
2002-04-29 17:05:43 +00:00
|
|
|
@@ -13887,6 +13888,7 @@
|
2000-08-04 01:19:21 +00:00
|
|
|
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
|
2002-04-29 17:05:43 +00:00
|
|
|
@@ -14356,10 +14358,6 @@
|
1999-03-09 01:13:40 +00:00
|
|
|
*) # 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.
|
