summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-21 15:06:23 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-21 15:06:23 +0000
commit0805f3adc5af8acfc76aac5715dc6e040e1af133 (patch)
tree85f4cbbc084bf5bdcf929b9149b67ffb1f29811f /Build
parentae24c8b86c79bee7eaf87231d65de94e4a42caac (diff)
icu: Fix a minor bug in configure
git-svn-id: svn://tug.org/texlive/trunk@25719 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting19
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string2
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated43
-rwxr-xr-xBuild/source/libs/icu/icu-49.1/configure15
-rw-r--r--Build/source/libs/icu/icu-49.1/configure.in2
6 files changed, 73 insertions, 12 deletions
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
index 210cb8752e2..24fb7e0b1d3 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-05-m4-quoting (new): Correct m4 quoting in configure.in.
+
2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-04-FreeBSD (new): From ICU.
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting b/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting
new file mode 100644
index 00000000000..87a4d7c6931
--- /dev/null
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting
@@ -0,0 +1,19 @@
+ Correct m4 quoting.
+ Use AC_LANG_PROGRAM to create a linkable program.
+
+ Without this we get an error msg
+ sed: can't read conftest.c: No such file or directory
+
+
+diff -ur icu-49.rc.orig/source/configure.in icu-49.rc/source/configure.in
+--- icu-49.rc.orig/source/configure.in 2012-03-03 17:20:02.000000000 +0100
++++ icu-49.rc/source/configure.in 2012-03-20 20:40:28.000000000 +0100
+@@ -285,7 +285,7 @@
+ ;;
+ esac
+
+- AC_LINK_IFELSE(AC_LANG_SOURCE, CHECK_STATIC_OPT_FLAG=yes, CHECK_STATIC_OPT_FLAG=no, )
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [CHECK_STATIC_OPT_FLAG=yes], [CHECK_STATIC_OPT_FLAG=no])
+ AC_MSG_RESULT($CHECK_STATIC_OPT_FLAG)
+ if test "$CHECK_STATIC_OPT_FLAG" = no; then
+ CPPFLAGS="${OLD_CPPFLAGS}"
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string b/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string
index 3db7b351c8b..2ef18282949 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string
@@ -1,5 +1,5 @@
diff -ur icu-49.rc.orig/source/configure.in icu-49.rc/source/configure.in
---- icu-49.rc.orig/source/configure.in 2012-03-03 17:20:02.000000000 +0100
+--- icu-49.rc.orig/source/configure.in 2012-03-20 20:40:28.000000000 +0100
+++ icu-49.rc/source/configure.in 2012-03-03 19:43:45.000000000 +0100
@@ -912,7 +912,27 @@
fi
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated b/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated
index 9b222c5abf6..47bd6382dae 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated
@@ -1,6 +1,6 @@
diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
--- icu-49.rc.orig/source/configure 2012-03-02 23:14:56.000000000 +0100
-+++ icu-49.rc/source/configure 2012-03-03 19:43:50.000000000 +0100
++++ icu-49.rc/source/configure 2012-03-20 21:19:48.000000000 +0100
@@ -623,6 +623,7 @@
EXTRAS_TRUE
U_CHECK_UTF16_STRING
@@ -44,7 +44,34 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
--enable-extras build ICU extras default=yes
--enable-icuio build ICU's icuio library default=yes
--enable-layout build ICU's layout library default=yes
-@@ -5460,47 +5458,9 @@
+@@ -5271,13 +5269,24 @@
+ ;;
+ esac
+
+- if ac_fn_c_try_link "$LINENO"; then :
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ CHECK_STATIC_OPT_FLAG=yes
+ else
+ CHECK_STATIC_OPT_FLAG=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext
++ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_STATIC_OPT_FLAG" >&5
+ $as_echo "$CHECK_STATIC_OPT_FLAG" >&6; }
+ if test "$CHECK_STATIC_OPT_FLAG" = no; then
+@@ -5460,47 +5469,9 @@
# look for 'ar' the proper way
@@ -95,7 +122,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_AR+:} false; then :
-@@ -5516,7 +5476,7 @@
+@@ -5516,7 +5487,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -104,7 +131,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5536,10 +5496,10 @@
+@@ -5536,10 +5507,10 @@
fi
@@ -118,7 +145,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-@@ -5564,7 +5524,6 @@
+@@ -5564,7 +5535,6 @@
done
IFS=$as_save_IFS
@@ -126,7 +153,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
-@@ -5576,9 +5535,16 @@
+@@ -5576,9 +5546,16 @@
$as_echo "no" >&6; }
fi
@@ -145,7 +172,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
fi
else
AR="$ac_cv_prog_AR"
-@@ -7140,8 +7106,31 @@
+@@ -7140,8 +7117,31 @@
fi
fi
@@ -177,7 +204,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
U_CHECK_UTF16_STRING=1
CHECK_UTF16_STRING_RESULT="unknown"
-@@ -7274,6 +7263,7 @@
+@@ -7274,6 +7274,7 @@
fi
fi
fi
diff --git a/Build/source/libs/icu/icu-49.1/configure b/Build/source/libs/icu/icu-49.1/configure
index 87b39ae593d..6e58d641da8 100755
--- a/Build/source/libs/icu/icu-49.1/configure
+++ b/Build/source/libs/icu/icu-49.1/configure
@@ -5269,13 +5269,24 @@ $as_echo_n "checking whether we can use static library optimization option... "
;;
esac
- if ac_fn_c_try_link "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
CHECK_STATIC_OPT_FLAG=yes
else
CHECK_STATIC_OPT_FLAG=no
fi
rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
+ conftest$ac_exeext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_STATIC_OPT_FLAG" >&5
$as_echo "$CHECK_STATIC_OPT_FLAG" >&6; }
if test "$CHECK_STATIC_OPT_FLAG" = no; then
diff --git a/Build/source/libs/icu/icu-49.1/configure.in b/Build/source/libs/icu/icu-49.1/configure.in
index 87c8340a18d..e8b4dcebef4 100644
--- a/Build/source/libs/icu/icu-49.1/configure.in
+++ b/Build/source/libs/icu/icu-49.1/configure.in
@@ -285,7 +285,7 @@ if test "$ENABLE_STATIC" = "YES"; then
;;
esac
- AC_LINK_IFELSE(AC_LANG_SOURCE, CHECK_STATIC_OPT_FLAG=yes, CHECK_STATIC_OPT_FLAG=no, )
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [CHECK_STATIC_OPT_FLAG=yes], [CHECK_STATIC_OPT_FLAG=no])
AC_MSG_RESULT($CHECK_STATIC_OPT_FLAG)
if test "$CHECK_STATIC_OPT_FLAG" = no; then
CPPFLAGS="${OLD_CPPFLAGS}"