--- configure.orig Fri May 11 04:08:46 2001 +++ configure Thu May 17 15:59:22 2001 @@ -5296,4 +5296,19 @@ - - +# Actually configure libtool. ac_aux_dir is where install-sh is found. +CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +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 $ac_aux_dir/ltmain.sh $lt_target \ +|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + +# Reload cache, that may have been modified by ltconfig +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi @@ -5306,4 +5321,5 @@ -# Prevent multiple expansion - +# Redirect the config.log output again, so that the ltconfig log is not +# clobbered by the next message. +exec 5>>./config.log @@ -6197,3 +6213,3 @@ OLDCPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS `glib-config --cflags`" +CPPFLAGS="$CPPFLAGS `$GLIB_CONFIG --cflags`"