mirror of
https://git.freebsd.org/ports.git
synced 2025-06-12 16:20:33 -04:00
62 lines
1.6 KiB
Text
62 lines
1.6 KiB
Text
--- configure.orig Wed Jun 13 18:45:10 2001
|
|
+++ configure Tue Jun 19 00:39:40 2001
|
|
@@ -5389,4 +5389,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
|
|
|
|
@@ -5394,3 +5409,3 @@
|
|
# This can be used to rebuild libtool when needed
|
|
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
|
|
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
|
|
|
@@ -5399,2 +5414,7 @@
|
|
|
|
+# Redirect the config.log output again, so that the ltconfig log is not
|
|
+# clobbered by the next message.
|
|
+exec 5>>./config.log
|
|
+
|
|
+
|
|
# Prevent multiple expansion
|
|
@@ -7911,3 +7931,3 @@
|
|
#include <stdlib.h>
|
|
-#include <iconv.h>
|
|
+#include <giconv.h>
|
|
int main() {
|
|
@@ -7928,3 +7948,3 @@
|
|
am_save_LIBS="$LIBS"
|
|
- LIBS="$LIBS -liconv"
|
|
+ LIBS="$LIBS -lgiconv"
|
|
cat > conftest.$ac_ext <<EOF
|
|
@@ -7933,3 +7953,3 @@
|
|
#include <stdlib.h>
|
|
-#include <iconv.h>
|
|
+#include <giconv.h>
|
|
int main() {
|
|
@@ -7971,3 +7991,3 @@
|
|
#include <stdlib.h>
|
|
-#include <iconv.h>
|
|
+#include <giconv.h>
|
|
extern
|
|
@@ -8009,3 +8029,3 @@
|
|
if test "$am_cv_lib_iconv" = yes; then
|
|
- LIBICONV="-liconv"
|
|
+ LIBICONV="-lgiconv"
|
|
fi
|