From 3ba06bc5a98bfc651ab7ec896205727f7373045d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 16 Apr 2010 09:43:14 +0000 Subject: build system update git-svn-id: svn://tug.org/texlive/trunk@17891 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ptexenc/Makefile.am | 2 +- Build/source/texk/ptexenc/Makefile.in | 4 +- Build/source/texk/ptexenc/ac/ptexenc.ac | 10 ++++ Build/source/texk/ptexenc/ac/withenable.ac | 2 +- Build/source/texk/ptexenc/configure | 90 ++++++++++++++++-------------- Build/source/texk/ptexenc/configure.ac | 43 +++++++------- 6 files changed, 82 insertions(+), 69 deletions(-) create mode 100644 Build/source/texk/ptexenc/ac/ptexenc.ac (limited to 'Build/source/texk/ptexenc') diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index 5d1848e2dcd..e29e2c65ddf 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -16,7 +16,7 @@ lib_LTLIBRARIES = libptexenc.la libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL -libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM) +libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO) libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 314fb6fe942..1ce3d42a3cd 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -189,7 +189,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTEXENCVERSION = @PTEXENCVERSION@ -PTEXENC_LT_VERSNUM = @PTEXENC_LT_VERSNUM@ +PTEXENC_LT_VERSINFO = @PTEXENC_LT_VERSINFO@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -254,7 +254,7 @@ INCLUDES = $(KPATHSEA_INCLUDES) -I$(top_builddir)/.. -I$(top_srcdir)/.. AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libptexenc.la libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL -libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM) +libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO) libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c ptexencincludedir = ${includedir}/ptexenc nodist_ptexencinclude_HEADERS = c-auto.h diff --git a/Build/source/texk/ptexenc/ac/ptexenc.ac b/Build/source/texk/ptexenc/ac/ptexenc.ac new file mode 100644 index 00000000000..9a1b0c9d7fc --- /dev/null +++ b/Build/source/texk/ptexenc/ac/ptexenc.ac @@ -0,0 +1,10 @@ +## texk/ptexenc/ac/ptexenc.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ +dnl +dnl Copyright (C) 2010 Peter Breitenlohner +dnl You may freely use, modify and/or distribute this file. +dnl +## basic check of system ptexenc +KPSE_TRY_LIB([ptexenc], + [#include ], + [const char *version = ptexenc_version_string; +set_enc_string("prog", "name");]) diff --git a/Build/source/texk/ptexenc/ac/withenable.ac b/Build/source/texk/ptexenc/ac/withenable.ac index 38d9a4152bd..1649eaf65be 100644 --- a/Build/source/texk/ptexenc/ac/withenable.ac +++ b/Build/source/texk/ptexenc/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2010 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for ptexenc -KPSE_WITH_LIB([ptexenc], [kpathsea], [tree]) +KPSE_WITH_TEXLIB([ptexenc], [kpathsea]) diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index 3a7c810e193..d4182d3075f 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for ptexenc 1.1.0. +# Generated by GNU Autoconf 2.65 for ptexenc 1.1.1dev. +# +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -228,10 +230,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and tex-k@tug.org +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." fi exit 1 fi @@ -698,9 +701,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ptexenc' PACKAGE_TARNAME='ptexenc' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='ptexenc 1.1.0' -PACKAGE_BUGREPORT='' +PACKAGE_VERSION='1.1.1dev' +PACKAGE_STRING='ptexenc 1.1.1dev' +PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' ac_unique_file="ptexenc.c" @@ -821,7 +824,7 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -PTEXENC_LT_VERSNUM +PTEXENC_LT_VERSINFO PTEXENCVERSION target_alias host_alias @@ -1430,7 +1433,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 ptexenc 1.1.0 to adapt to many kinds of systems. +\`configure' configures ptexenc 1.1.1dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1500,7 +1503,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ptexenc 1.1.0:";; + short | recursive ) echo "Configuration of ptexenc 1.1.1dev:";; esac cat <<\_ACEOF @@ -1534,7 +1537,7 @@ Optional Packages: kpathsea headers installed in DIR --with-kpathsea-libdir=DIR kpathsea library installed in DIR - --with-ptexenc-enc=ENC Default pTeX character encode + --with-ptexenc-enc=ENC Default pTeX character encoding (ENC=JIS/EUC/SJIS/UTF8, default UTF8) Some influential environment variables: @@ -1550,7 +1553,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. +Report bugs to . _ACEOF ac_status=$? fi @@ -1613,7 +1616,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ptexenc configure 1.1.0 +ptexenc configure 1.1.1dev generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1958,6 +1961,12 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ---------------------------- ## +## Report this to tex-k@tug.org ## +## ---------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -2089,7 +2098,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 ptexenc $as_me 1.1.0, which was +It was created by ptexenc $as_me 1.1.1dev, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2463,11 +2472,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -PTEXENCVERSION=2.0.2 +PTEXENCVERSION=1.1.1dev -$as_echo "#define PTEXENCVERSION \"ptexenc version 2.0.2\"" >>confdefs.h +$as_echo "#define PTEXENCVERSION \"ptexenc version 1.1.1dev\"" >>confdefs.h -PTEXENC_LT_VERSNUM=2:0:2 +PTEXENC_LT_VERSINFO=2:1:1 am__api_version='1.11' @@ -4546,13 +4555,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4549: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4558: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4552: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4561: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4555: output\"" >&5) + (eval echo "\"\$as_me:4564: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5755,7 +5764,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5758 "configure"' > conftest.$ac_ext + echo '#line 5767 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6821,7 +6830,7 @@ fi # Define the identity of the package. PACKAGE='ptexenc' - VERSION='1.1.0' + VERSION='1.1.1dev' cat >>confdefs.h <<_ACEOF @@ -7685,11 +7694,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7688: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7697: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7692: \$? = $ac_status" >&5 + echo "$as_me:7701: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8024,11 +8033,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8036: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8031: \$? = $ac_status" >&5 + echo "$as_me:8040: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8129,11 +8138,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8132: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8141: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8136: \$? = $ac_status" >&5 + echo "$as_me:8145: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8184,11 +8193,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8196: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8191: \$? = $ac_status" >&5 + echo "$as_me:8200: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10551,7 +10560,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10554 "configure" +#line 10563 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10647,7 +10656,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10650 "configure" +#line 10659 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11751,9 +11760,6 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags -#AC_CHECK_DECLS([putenv, strstr]) -#AC_REPLACE_FUNCS([putenv strcasecmp strtol strstr]) - kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS @@ -12174,7 +12180,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -ptexenc config.lt 1.1.0 +ptexenc config.lt 1.1.1dev configured by $0, generated by GNU Autoconf 2.65. Copyright (C) 2008 Free Software Foundation, Inc. @@ -13212,8 +13218,8 @@ if test "x$kpse_cv_kpse_debug" != xyes; then : fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default pTeX character encode" >&5 -$as_echo_n "checking default pTeX character encode... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default pTeX character encoding" >&5 +$as_echo_n "checking default pTeX character encoding... " >&6; } # Check whether --with-ptexenc-enc was given. if test "${with_ptexenc_enc+set}" = set; then : @@ -13919,7 +13925,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 ptexenc $as_me 1.1.0, which was +This file was extended by ptexenc $as_me 1.1.1dev, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13979,13 +13985,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ptexenc config.status 1.1.0 +ptexenc config.status 1.1.1dev configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/ptexenc/configure.ac b/Build/source/texk/ptexenc/configure.ac index 6c744bfbe38..8d2acff383a 100644 --- a/Build/source/texk/ptexenc/configure.ac +++ b/Build/source/texk/ptexenc/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner +dnl Copyright (C) 2010 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -20,13 +20,13 @@ dnl dnl After a release, set ptexenc_lib_dev to "dev", to distinguish dnl binaries built between releases. -m4_define([ptexenc_lib_major], [2])[]dnl -m4_define([ptexenc_lib_minor], [0])[]dnl -m4_define([ptexenc_lib_micro], [2])[]dnl -m4_define([ptexenc_lib_devel], [])[]dnl or "dev" +m4_define([ptexenc_lib_major], [1])[]dnl +m4_define([ptexenc_lib_minor], [1])[]dnl +m4_define([ptexenc_lib_micro], [1])[]dnl +m4_define([ptexenc_lib_devel], [dev])[]dnl or "dev" m4_define([ptexenc_version], [ptexenc_lib_major.ptexenc_lib_minor.ptexenc_lib_micro[]ptexenc_lib_devel])[]dnl -AC_INIT([ptexenc], [1.1.0]) +AC_INIT([ptexenc], [ptexenc_version], [tex-k@tug.org]) AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([ptexenc.c]) AC_CONFIG_AUX_DIR([../../build-aux]) @@ -34,21 +34,18 @@ AC_CONFIG_MACRO_DIR([../../m4]) AC_SUBST([PTEXENCVERSION], [ptexenc_version]) AC_DEFINE([PTEXENCVERSION], ["ptexenc version ptexenc_version"]) -AC_SUBST([PTEXENC_LT_VERSNUM], [ptexenc_lib_major:ptexenc_lib_minor:ptexenc_lib_micro]) +AC_SUBST([PTEXENC_LT_VERSINFO], + [m4_eval(ptexenc_lib_major+ptexenc_lib_minor):ptexenc_lib_micro:ptexenc_lib_minor]) dnl Common code for all programs using libptexenc. KPSE_COMMON([ptexenc]) -dnl Replacement functions that may be required on ancient broken system. -#AC_CHECK_DECLS([putenv, strstr]) -#AC_REPLACE_FUNCS([putenv strcasecmp strtol strstr]) - KPSE_KPATHSEA_FLAGS dnl withenable.ac: --with and --enable options. -AC_MSG_CHECKING(default pTeX character encode) -AC_ARG_WITH(ptexenc-enc, -[ --with-ptexenc-enc=ENC Default pTeX character encode +AC_MSG_CHECKING([default pTeX character encoding]) +AC_ARG_WITH([ptexenc-enc], +[ --with-ptexenc-enc=ENC Default pTeX character encoding (ENC=JIS/EUC/SJIS/UTF8, default UTF8)], [case $withval in jis|JIS) PTEXENC=ENC_JIS;; @@ -56,23 +53,23 @@ AC_ARG_WITH(ptexenc-enc, sjis|SJIS) PTEXENC=ENC_SJIS;; utf8|UTF8) PTEXENC=ENC_UTF8;; *) PTEXENC=ENC_UTF8; - AC_MSG_WARN(Unknown --with-ptexenc-enc argument \`$withval';);; - esac; AC_MSG_RESULT($PTEXENC) + AC_MSG_WARN([Unknown --with-ptexenc-enc argument \`$withval';]);; + esac; AC_MSG_RESULT([$PTEXENC]) AC_DEFINE_UNQUOTED([DEFAULT_KANJI_ENC],[$PTEXENC],[Default kanji encode])], - [AC_MSG_RESULT(ENC_UTF8) + [AC_MSG_RESULT([ENC_UTF8]) AC_DEFINE_UNQUOTED([DEFAULT_KANJI_ENC],[ENC_UTF8],[Default kanji encode])]) -AC_ARG_ENABLE(kanji-iconv, +AC_ARG_ENABLE([kanji-iconv], [ --enable-kanji-iconv use iconv for kanji <=> unicode conversion], - , enable_kanji_iconv=no) + , [enable_kanji_iconv=no]) if test "x$enable_kanji_iconv" = "xyes"; then AC_DEFINE([KANJI_ICONV], 1, [Define 1 if you use iconv for kanji <=> unicode conversion]) -AC_CHECK_LIB(iconv, iconv_open,,AC_CHECK_LIB(iconv, libiconv_open)) -AC_CHECK_HEADERS(iconv.h) -AC_CHECK_FUNCS(iconv) -AC_CHECK_FUNCS(atexit on_exit, break) +AC_CHECK_LIB([iconv], [iconv_open], ,[AC_CHECK_LIB([iconv], [libiconv_open])]) +AC_CHECK_HEADERS([iconv.h]) +AC_CHECK_FUNCS([iconv]) +AC_CHECK_FUNCS([atexit on_exit], [break]) fi -- cgit v1.2.3