2000-04-14 18:13:57 +00:00
|
|
|
--- configure.orig Wed Mar 29 18:55:23 2000
|
|
|
|
+++ configure Sun Apr 9 14:46:44 2000
|
2000-04-02 19:14:30 +00:00
|
|
|
@@ -1494,8 +1494,8 @@
|
|
|
|
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
|
|
|
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
|
|
|
|
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
|
|
|
|
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|
|
|
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|
|
|
|
+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
|
|
|
|
+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
|
|
|
|
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
|
|
|
|
|
|
|
# Reload cache, that may have been modified by ltconfig
|
|
|
|
@@ -1509,10 +1509,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
# This can be used to rebuild libtool when needed
|
|
|
|
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
|
|
|
+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
|
|
|
|
|
|
|
|
# Always use our own libtool.
|
|
|
|
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
|
|
+LIBTOOL="/usr/local/bin/libtool"
|
|
|
|
|
|
|
|
# Redirect the config.log output again, so that the ltconfig log is not
|
|
|
|
# clobbered by the next message.
|
2000-02-24 07:32:36 +00:00
|
|
|
@@ -3480,7 +3480,11 @@
|
1999-05-29 04:17:00 +00:00
|
|
|
cat conftest.$ac_ext >&5
|
|
|
|
rm -rf conftest*
|
|
|
|
CATOBJEXT=.mo
|
|
|
|
- DATADIRNAME=lib
|
|
|
|
+ DATADIRNAME=share
|
|
|
|
+ INTLDEPS='-lintl'
|
|
|
|
+ INTLLIBS=$INTLDEPS
|
|
|
|
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
1999-10-23 07:59:42 +00:00
|
|
|
+
|
1999-02-20 19:31:51 +00:00
|
|
|
fi
|
1999-05-29 04:17:00 +00:00
|
|
|
rm -f conftest*
|
|
|
|
INSTOBJEXT=.mo
|
2000-04-14 18:13:57 +00:00
|
|
|
@@ -7016,8 +7020,8 @@
|
|
|
|
|
1999-02-20 19:31:51 +00:00
|
|
|
fi
|
1998-05-27 18:36:05 +00:00
|
|
|
|
2000-04-14 18:13:57 +00:00
|
|
|
-gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
|
1998-05-27 18:36:05 +00:00
|
|
|
-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
|
2000-04-14 18:13:57 +00:00
|
|
|
+gimpdatadir=$datadir/gimp
|
1998-05-27 18:36:05 +00:00
|
|
|
+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
|
1999-05-29 04:17:00 +00:00
|
|
|
localedir='${prefix}/${DATADIRNAME}/locale'
|
1998-04-17 13:31:19 +00:00
|
|
|
|
|
|
|
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
|
2000-04-14 18:13:57 +00:00
|
|
|
@@ -8602,11 +8606,6 @@
|
|
|
|
*) # Relative path.
|
|
|
|
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
|
1999-10-23 07:59:42 +00:00
|
|
|
top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
2000-04-14 18:13:57 +00:00
|
|
|
- esac
|
|
|
|
-
|
1999-05-29 04:17:00 +00:00
|
|
|
- case "$ac_given_INSTALL" in
|
1999-10-23 07:59:42 +00:00
|
|
|
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
|
|
|
|
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
|
2000-04-14 18:13:57 +00:00
|
|
|
esac
|
1998-09-30 14:52:27 +00:00
|
|
|
|
1999-10-23 07:59:42 +00:00
|
|
|
echo creating "$ac_file"
|