diff options
25 files changed, 76 insertions, 675 deletions
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 8897ee493b0..482caa2e993 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop KPSE_COMPILER_WARNIGS, use KPSE_COND_WIN32. + 2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Moved Makefile fragments to ../../am/. diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index d01708dafaa..386758ef9a3 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -14621,12 +14621,6 @@ else fi - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; } if ${kpse_cv_have_win32+:} false; then : @@ -14682,6 +14676,7 @@ else fi + CJKUTILS_TREE=cjkutils-4.8.3 diff --git a/Build/source/texk/cjkutils/configure.ac b/Build/source/texk/cjkutils/configure.ac index dd30cd4c70b..fdaeba73fe8 100644 --- a/Build/source/texk/cjkutils/configure.ac +++ b/Build/source/texk/cjkutils/configure.ac @@ -62,10 +62,7 @@ if test x"$do_cweb" = xyes; then fi AM_CONDITIONAL([do_cweb], [test "x$do_cweb" = xyes]) -KPSE_COMPILER_WARNINGS - -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) +KPSE_COND_WIN32 AC_SUBST([CJKUTILS_TREE], [cjkutils-]cjk_version) diff --git a/Build/source/texk/devnag/ChangeLog b/Build/source/texk/devnag/ChangeLog index e5b85bea552..965a42b8710 100644 --- a/Build/source/texk/devnag/ChangeLog +++ b/Build/source/texk/devnag/ChangeLog @@ -1,3 +1,8 @@ +2013-10-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop AC_HEADER_STDC, fail for missing strstr(). + * Makefile.am: Adapted. + 2013-03-15 Peter Breitenlohner <peb@mppmu.mpg.de> * src/Makefile.am (removed): Merged into Makefile.am. diff --git a/Build/source/texk/devnag/Makefile.am b/Build/source/texk/devnag/Makefile.am index feb76f8e548..a99c71f2231 100644 --- a/Build/source/texk/devnag/Makefile.am +++ b/Build/source/texk/devnag/Makefile.am @@ -11,6 +11,14 @@ bin_PROGRAMS = devnag devnag_SOURCES = src/devnag.c +$(devnag_OBJECTS): config.force + +config.force: $(KPATHSEA_DEPEND) + echo timestamp >config.force + $(SHELL) ./config.status --recheck + +DISTCLEANFILES = config.force + ## Tests. ## TESTS = tests/devnag.test diff --git a/Build/source/texk/devnag/Makefile.in b/Build/source/texk/devnag/Makefile.in index baee29772b1..4c05d61c40c 100644 --- a/Build/source/texk/devnag/Makefile.in +++ b/Build/source/texk/devnag/Makefile.in @@ -393,7 +393,6 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -401,9 +400,7 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -475,11 +472,11 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 AM_CFLAGS = $(WARNING_CFLAGS) devnag_SOURCES = src/devnag.c +DISTCLEANFILES = captions.dn examples.dn *.tex TESTS = tests/devnag.test EXTRA_DIST = $(TESTS) tests/captions.dn tests/captions.tex \ tests/examples.dn tests/examples.tex tests/misspaal.dn \ tests/misspaal.tex tests/vedasample.dn tests/vedasample.tex -DISTCLEANFILES = captions.dn examples.dn *.tex all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1127,6 +1124,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall uninstall-am uninstall-binPROGRAMS +$(devnag_OBJECTS): config.force + +config.force: $(KPATHSEA_DEPEND) + echo timestamp >config.force + $(SHELL) ./config.status --recheck + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/devnag/config.h.in b/Build/source/texk/devnag/config.h.in index 336854dd5e5..dd3b02c5fcf 100644 --- a/Build/source/texk/devnag/config.h.in +++ b/Build/source/texk/devnag/config.h.in @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - /* Name of package */ #undef PACKAGE @@ -24,8 +21,5 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - /* Version number of package */ #undef VERSION diff --git a/Build/source/texk/devnag/configure b/Build/source/texk/devnag/configure index 94144bf11b3..cc6ff510aaf 100755 --- a/Build/source/texk/devnag/configure +++ b/Build/source/texk/devnag/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for devnag for TeX Live 2.15. +# Generated by GNU Autoconf 2.69 for devnag (TeX Live) 2.15. # # Report bugs to <tex-k@tug.org>. # @@ -197,8 +197,7 @@ test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes else @@ -578,10 +577,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='devnag for TeX Live' -PACKAGE_TARNAME='devnag-for-tex-live' +PACKAGE_NAME='devnag (TeX Live)' +PACKAGE_TARNAME='devnag--tex-live-' PACKAGE_VERSION='2.15' -PACKAGE_STRING='devnag for TeX Live 2.15' +PACKAGE_STRING='devnag (TeX Live) 2.15' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -590,9 +589,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -EGREP -GREP -CPP WARNING_CFLAGS am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -694,8 +690,7 @@ CC CFLAGS LDFLAGS LIBS -CPPFLAGS -CPP' +CPPFLAGS' # Initialize some variables set by options. @@ -1236,7 +1231,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures devnag for TeX Live 2.15 to adapt to many kinds of systems. +\`configure' configures devnag (TeX Live) 2.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1285,7 +1280,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/devnag-for-tex-live] + [DATAROOTDIR/doc/devnag--tex-live-] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1303,7 +1298,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of devnag for TeX Live 2.15:";; + short | recursive ) echo "Configuration of devnag (TeX Live) 2.15:";; esac cat <<\_ACEOF @@ -1332,7 +1327,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> - CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1400,7 +1394,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -devnag for TeX Live configure 2.15 +devnag (TeX Live) configure 2.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1498,85 +1492,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -1647,7 +1562,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by devnag for TeX Live $as_me 2.15, which was +It was created by devnag (TeX Live) $as_me 2.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3569,7 +3484,7 @@ fi # Define the identity of the package. - PACKAGE='devnag-for-tex-live' + PACKAGE='devnag--tex-live-' VERSION='2.15' @@ -4501,401 +4416,19 @@ fi +if test "x$enable_build" != xno || test -f config.force; then -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : +ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" +if test "x$ac_cv_func_strstr" = xyes; then : else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi + as_fn_error $? "Sorry, your system has no strstr function." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h +echo timestamp >config.force fi - - -for ac_func in strstr -do : - ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" -if test "x$ac_cv_func_strstr" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRSTR 1 -_ACEOF - -fi -done - - ac_config_files="$ac_config_files Makefile" @@ -5437,7 +4970,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by devnag for TeX Live $as_me 2.15, which was +This file was extended by devnag (TeX Live) $as_me 2.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5503,7 +5036,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -devnag for TeX Live config.status 2.15 +devnag (TeX Live) config.status 2.15 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/devnag/configure.ac b/Build/source/texk/devnag/configure.ac index 374395a6f88..1d891c13478 100644 --- a/Build/source/texk/devnag/configure.ac +++ b/Build/source/texk/devnag/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([devnag for TeX Live], [2.15], [tex-k@tug.org]) +AC_INIT([devnag (TeX Live)], [2.15], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([src/devnag.c]) AC_CONFIG_AUX_DIR([../../build-aux]) @@ -20,15 +20,13 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL -dnl Checks for libraries. +if test "x$enable_build" != xno || test -f config.force; then -dnl Checks for header files. -AC_HEADER_STDC +AC_CHECK_FUNC([strstr], , + [AC_MSG_ERROR([Sorry, your system has no strstr function.])]) -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Checks for library functions. -AC_CHECK_FUNCS([strstr]) +echo timestamp >config.force +fi AC_CONFIG_FILES([Makefile]) diff --git a/Build/source/texk/dvipdf-x/ChangeLog b/Build/source/texk/dvipdf-x/ChangeLog index b652d9641bb..94ceaf204b8 100644 --- a/Build/source/texk/dvipdf-x/ChangeLog +++ b/Build/source/texk/dvipdf-x/ChangeLog @@ -1,3 +1,8 @@ +2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop the useless KPSE_LT_HACK. + Drop the redundant AC_HEADER_STDC and check for mkstemp. + 2013-09-24 Peter Breitenlohner <peb@mppmu.mpg.de> * spc_xtx.c, xsrc/dpxutil.[ch], xsrc/dvipdfmx.c, xsrc/epdf.[ch], diff --git a/Build/source/texk/dvipdf-x/Makefile.in b/Build/source/texk/dvipdf-x/Makefile.in index 9e9837f718d..4e48af69b66 100644 --- a/Build/source/texk/dvipdf-x/Makefile.in +++ b/Build/source/texk/dvipdf-x/Makefile.in @@ -118,7 +118,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpaper.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ diff --git a/Build/source/texk/dvipdf-x/aclocal.m4 b/Build/source/texk/dvipdf-x/aclocal.m4 index a0babfe9e96..c1337a226aa 100644 --- a/Build/source/texk/dvipdf-x/aclocal.m4 +++ b/Build/source/texk/dvipdf-x/aclocal.m4 @@ -1225,7 +1225,6 @@ m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpaper.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) -m4_include([../../m4/kpse-lt-hack.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure index 472df4e0ab3..1c84299de82 100755 --- a/Build/source/texk/dvipdf-x/configure +++ b/Build/source/texk/dvipdf-x/configure @@ -798,7 +798,6 @@ enable_libtool_lock enable_largefile enable_dvipdf enable_xdvipdf -enable_libtool_hack with_system_kpathsea with_kpathsea_includes with_kpathsea_libdir @@ -1457,7 +1456,6 @@ Optional Features: --disable-largefile omit support for large files --disable-dvipdf do not build the dvipdf program --disable-xdvipdf do not build the xdvipdf program - --enable-libtool-hack ignore libtool dependency_libs Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -13219,128 +13217,6 @@ test "x$enable_dvipdf_x:$enable_xdvipdf" = xyes:yes && need_freetype2=yes ac_config_headers="$ac_config_headers config.h" -# Check whether --enable-libtool-hack was given. -if test "${enable_libtool_hack+set}" = set; then : - enableval=$enable_libtool_hack; -fi - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - for ac_header in unistd.h stdint.h inttypes.h sys/types.h sys/wait.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -13417,7 +13293,7 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in esac -for ac_func in open close getenv mkstemp basename +for ac_func in open close getenv basename 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" @@ -14703,7 +14579,6 @@ fi RM='$RM' ofile='$ofile' -enable_libtool_hack='$enable_libtool_hack' _LTEOF @@ -15343,16 +15218,6 @@ fi (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -## KPSE_LT_HACK: Prevent libtool from linking dependency_libs -if test "x$enable_libtool_hack" = xyes; then - $SED '/# Convert "-framework/i\ - ## KPSE_LT_HACK: ignore dependency_libs\ - test "X$installed" = Xyes && dependency_libs=\ -' "$ofile" >"$cfgfile" - mv "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -fi as_fn_exit 0 _LTEOF @@ -17071,7 +16936,6 @@ fi RM='$RM' ofile='$ofile' -enable_libtool_hack='$enable_libtool_hack' ac_aux_dir='$ac_aux_dir' @@ -18443,16 +18307,6 @@ fi (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -## KPSE_LT_HACK: Prevent libtool from linking dependency_libs -if test "x$enable_libtool_hack" = xyes; then - $SED '/# Convert "-framework/i\ - ## KPSE_LT_HACK: ignore dependency_libs\ - test "X$installed" = Xyes && dependency_libs=\ -' "$ofile" >"$cfgfile" - mv "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -fi ;; esac diff --git a/Build/source/texk/dvipdf-x/configure.ac b/Build/source/texk/dvipdf-x/configure.ac index 4132c5048b0..a481621cd3e 100644 --- a/Build/source/texk/dvipdf-x/configure.ac +++ b/Build/source/texk/dvipdf-x/configure.ac @@ -19,15 +19,12 @@ m4_include([ac/dvipdf-x.ac]) AC_CONFIG_HEADERS([config.h]) -KPSE_LT_HACK - dnl Checks for header files. -AC_HEADER_STDC AC_CHECK_HEADERS([unistd.h stdint.h inttypes.h sys/types.h sys/wait.h]) dnl Checks for library functions. AC_FUNC_MEMCMP -AC_CHECK_FUNCS([open close getenv mkstemp basename]) +AC_CHECK_FUNCS([open close getenv basename]) dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM diff --git a/Build/source/texk/dvipdf-x/data/Makefile.in b/Build/source/texk/dvipdf-x/data/Makefile.in index b4c95e868f4..49f81b59b2c 100644 --- a/Build/source/texk/dvipdf-x/data/Makefile.in +++ b/Build/source/texk/dvipdf-x/data/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpaper.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ diff --git a/Build/source/texk/dvipdf-x/man/Makefile.in b/Build/source/texk/dvipdf-x/man/Makefile.in index cd6f58f4e01..e3558f7e5c6 100644 --- a/Build/source/texk/dvipdf-x/man/Makefile.in +++ b/Build/source/texk/dvipdf-x/man/Makefile.in @@ -86,7 +86,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpaper.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index b51e980c158..0afee0491dd 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use KPSE_COND_WIN32. + 2013-09-10 Peter Breitenlohner <peb@mppmu.mpg.de> * Imported release 1.5. diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index e6764436654..38eb72daf15 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -17331,6 +17331,7 @@ else fi + kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index f428120bbce..f61b91ce82e 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -42,8 +42,7 @@ AC_SEARCH_LIBS([sqrt], [m]) AC_CHECK_FUNCS([ftime gettimeofday]) AC_CHECK_HEADERS([sys/time.h sys/timeb.h]) -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) +KPSE_COND_WIN32 KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index 13e15d99cc2..e8ddd5fee3b 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,7 @@ +2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use KPSE_COND_WIN32. + 2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> * scanid.c: Replace bzero(s, l) => memset(s, 0, l). diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index a0e5e5524fa..cf22297d44f 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -14455,6 +14455,7 @@ else fi + ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/makeindexk/configure.ac b/Build/source/texk/makeindexk/configure.ac index 5c5c7a27c1a..eb90d364f95 100644 --- a/Build/source/texk/makeindexk/configure.ac +++ b/Build/source/texk/makeindexk/configure.ac @@ -26,8 +26,7 @@ AC_CHECK_FUNCS([strchr strrchr setlocale]) KPSE_KPATHSEA_FLAGS -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) +KPSE_COND_WIN32 AC_CONFIG_FILES([Makefile]) diff --git a/Build/source/utils/tpic2pdftex/ChangeLog b/Build/source/utils/tpic2pdftex/ChangeLog index 63d1eeb473b..2793fa32456 100644 --- a/Build/source/utils/tpic2pdftex/ChangeLog +++ b/Build/source/utils/tpic2pdftex/ChangeLog @@ -1,3 +1,7 @@ +2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use KPSE_COND_WIN32. + 2013-03-28 Karl Berry <karl@tug.org> * tpic2pdftex: set LC_ALL, not LANG, and advise same diff --git a/Build/source/utils/tpic2pdftex/configure b/Build/source/utils/tpic2pdftex/configure index 67fe294717a..d7ea3e7c255 100755 --- a/Build/source/utils/tpic2pdftex/configure +++ b/Build/source/utils/tpic2pdftex/configure @@ -3675,6 +3675,7 @@ else fi + ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/utils/tpic2pdftex/configure.ac b/Build/source/utils/tpic2pdftex/configure.ac index e5fc4d61443..e051a127da6 100644 --- a/Build/source/utils/tpic2pdftex/configure.ac +++ b/Build/source/utils/tpic2pdftex/configure.ac @@ -14,8 +14,7 @@ AC_CONFIG_MACRO_DIR([../../m4]) KPSE_BASIC([tpic2pdftex]) -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) +KPSE_COND_WIN32 AC_CONFIG_FILES([Makefile]) |