minor build fixes

git-svn-id: svn://tug.org/texlive/trunk@16470 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 37 insertions, 10 deletions

diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 3b269da8c39..dd7ea8639eb 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: Changes for xdvik (TeX Live)
 ==================================================
 
+2009-12-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tests/test_string_utils.c (test_my_stristr): Make test result
+	independent of compiler optimizations (constant folding).
+
 2009-12-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tests/test_string_utils.c (test_expand_filename):
diff --git a/Build/source/texk/xdvik/tests/test_string_utils.c b/Build/source/texk/xdvik/tests/test_string_utils.c
index b3cb9a70cf4..0498524a661 100644
--- a/Build/source/texk/xdvik/tests/test_string_utils.c
+++ b/Build/source/texk/xdvik/tests/test_string_utils.c
@@ -163,14 +163,16 @@ static Boolean test_my_stristr(int verbose)
     size_t i;
     Boolean result = True;
     for (i = 0; i < (sizeof tests / sizeof tests[0]); i++) {
+	char *res = my_stristr(tests[i].str1, tests[i].str2);
 	if (verbose) {
 	    INFO((stderr, "my_stristr(%s, %s) -> %s == %s?\n",
 		  tests[i].str1,
 		  tests[i].str2,
-		  my_stristr(tests[i].str1, tests[i].str2),
+		  res,
 		  tests[i].result));
 	}
-	if (my_stristr(tests[i].str1, tests[i].str2) != tests[i].result) {
+	if (res != tests[i].result &&
+	  (res == NULL || tests[i].result == NULL || strcmp(res, tests[i].result))) {
 	    result = False;
 	}
     }
diff --git a/Build/source/utils/xindy-new/ChangeLog b/Build/source/utils/xindy-new/ChangeLog
index e8c0067cb72..07c7483e199 100644
--- a/Build/source/utils/xindy-new/ChangeLog
+++ b/Build/source/utils/xindy-new/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Remove test for strrchr(), require strtoul().
+
+2009-12-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac (AC_CONFIG_FILES):
+	Remove make-rules/alphabets/*/Makefile (compare patch-50).
+
 2009-12-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported http://www.xindy.org/xindy-2.4-pre2.tar.gz.
diff --git a/Build/source/utils/xindy-new/configure b/Build/source/utils/xindy-new/configure
index 1eaad1b5da4..7779c5dc9c2 100755
--- a/Build/source/utils/xindy-new/configure
+++ b/Build/source/utils/xindy-new/configure
@@ -4052,19 +4052,24 @@ else
 fi
 
 
+# No checks for header files. We use stdio.h, unistd.h, and string.h.
+# Today, they are universally available if a C compiler is installed.
+
 # Checks for typedefs, structures, and compiler characteristics.
 
 # Checks for library functions.
-for ac_func in strrchr strtoul
+# The code in tex2indy.l simply assumes that strtoul() is there, would
+# need a replacement.
+for ac_func in strtoul
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+  ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
+if test "x$ac_cv_func_strtoul" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_STRTOUL 1
 _ACEOF
 
+else
+  as_fn_error "strtoul() is needed" "$LINENO" 5
 fi
 done
 
diff --git a/Build/source/utils/xindy-new/configure.ac b/Build/source/utils/xindy-new/configure.ac
index 6856416ec61..6fdee54ffdc 100644
--- a/Build/source/utils/xindy-new/configure.ac
+++ b/Build/source/utils/xindy-new/configure.ac
@@ -118,10 +118,16 @@ else
 fi
 AC_SUBST([CONVERT_FROM_UTF8])
 
+# No checks for header files. We use stdio.h, unistd.h, and string.h.
+# Today, they are universally available if a C compiler is installed.
+
 # Checks for typedefs, structures, and compiler characteristics.
 
 # Checks for library functions.
-AC_CHECK_FUNCS([strrchr strtoul])
+# The code in tex2indy.l simply assumes that strtoul() is there, would
+# need a replacement.
+AC_CHECK_FUNCS([strtoul], [],
+               [AC_MSG_ERROR([strtoul() is needed])])
 
 echo timestamp >config.force
 fi
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
index b931dd38582..a9a55d336ca 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
@@ -16,8 +16,8 @@ Moved user-commands/texindy => user-commands/texindy.in and removed
 	execute permissions.
 
 Removed:
-	make-rules/alphabets/*/Makefile.in
 	make-rules/alphabets/*/*.xdy
+	modules/*/{,*/}Makefile.{am,in}
 
 Removed:
 	make-rules/alphabets/*/*.xdy