72 lines
2.5 KiB
Plaintext
72 lines
2.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.3 2005/11/04 09:42:31 alek Exp $
|
|
--- configure.orig Fri Aug 19 21:42:59 2005
|
|
+++ configure Mon Oct 3 08:21:17 2005
|
|
@@ -1578,7 +1578,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
ac_aux_dir=
|
|
-for ac_dir in ac-helpers $srcdir/ac-helpers; do
|
|
+for ac_dir in !!LOCALBASE!!/share/libtool; do
|
|
if test -f $ac_dir/install-sh; then
|
|
ac_aux_dir=$ac_dir
|
|
ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
@@ -1594,8 +1594,8 @@ for ac_dir in ac-helpers $srcdir/ac-help
|
|
fi
|
|
done
|
|
if test -z "$ac_aux_dir"; then
|
|
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ac-helpers $srcdir/ac-helpers" >&5
|
|
-echo "$as_me: error: cannot find install-sh or install.sh in ac-helpers $srcdir/ac-helpers" >&2;}
|
|
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in !!LOCALBASE!!/share/libtool" >&5
|
|
+echo "$as_me: error: cannot find install-sh or install.sh in !!LOCALBASE!!/share/libtool" >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
fi
|
|
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
|
@@ -1609,7 +1609,7 @@ echo "$as_me: Configuring Subversion 1.2
|
|
abs_srcdir="`cd $srcdir && pwd`"
|
|
abs_builddir="`pwd`"
|
|
|
|
-INSTALL="$abs_srcdir/ac-helpers/install-sh -c"
|
|
+INSTALL="!!LOCALBASE!!/share/libtool/install-sh -c"
|
|
|
|
|
|
MKDIR="$INSTALL -d"
|
|
@@ -3671,8 +3671,9 @@ if test "$experimental_libtool" = "yes";
|
|
LIBTOOL="$sh_libtool"
|
|
SVN_LIBTOOL="$sh_libtool"
|
|
else
|
|
- sh_libtool="$abs_builddir/libtool"
|
|
- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
|
|
+ sh_libtool="!!LOCALBASE!!/bin/libtool"
|
|
+ LIBTOOL="$sh_libtool"
|
|
+ SVN_LIBTOOL="$sh_libtool"
|
|
# Check whether --enable-shared or --disable-shared was given.
|
|
if test "${enable_shared+set}" = set; then
|
|
enableval="$enable_shared"
|
|
@@ -19457,7 +19458,7 @@ fi
|
|
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
|
|
|
|
# Always use our own libtool.
|
|
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
+LIBTOOL='!!LOCALBASE!!/bin/libtool'
|
|
|
|
# Prevent multiple expansion
|
|
|
|
@@ -20663,7 +20664,7 @@ rm -f conftest.err conftest.$ac_objext \
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
if test "$ac_cv_search_bindtextdomain" = no; then
|
|
for ac_lib in intl; do
|
|
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
+ LIBS="-l$ac_lib -liconv $ac_func_search_save_LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -20708,7 +20709,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
- ac_cv_search_bindtextdomain="-l$ac_lib"
|
|
+ ac_cv_search_bindtextdomain="-l$ac_lib -liconv"
|
|
break
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|