diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-07-20 07:00:05 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-07-20 07:00:05 +0000 |
commit | 89755f7344de571c4b1b7c68e90de39363a4d1ff (patch) | |
tree | d735587f7030f0536272048df7a4b53cefc133a4 /Build/source/texk/ptexenc | |
parent | 713aef9b071ca2b5dd68d014e99897f0e5e2036c (diff) |
libs/t1lib + texk/ps2pkm: bug fix and update
git-svn-id: svn://tug.org/texlive/trunk@23187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ptexenc')
-rw-r--r-- | Build/source/texk/ptexenc/ChangeLog.TL | 5 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/Makefile.in | 3 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/texk/ptexenc/configure | 33 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/configure.ac | 26 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/version.ac | 24 |
6 files changed, 53 insertions, 39 deletions
diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL index d90c91f9056..e7d3bae15fe 100644 --- a/Build/source/texk/ptexenc/ChangeLog.TL +++ b/Build/source/texk/ptexenc/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: TeX Live (TL) changes for ptexenc =============================================== +2011-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * version.ac: New file defining the ptexenc version. + * configure.ac: Adapt. Use KPSE_LT_VERSION. + 2011-01-11 Peter Breitenlohner <peb@mppmu.mpg.de> For e-pTeX, adapted from eptex-110102.tar.xz by Hironori Kitagawa. diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index dd18b9eb89b..873e3dbe0ad 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -52,12 +52,13 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ - $(top_srcdir)/../../m4/lt~obsolete.m4 \ + $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/texk/ptexenc/aclocal.m4 b/Build/source/texk/ptexenc/aclocal.m4 index d77f3a9c0b1..0c7daf6cb9e 100644 --- a/Build/source/texk/ptexenc/aclocal.m4 +++ b/Build/source/texk/ptexenc/aclocal.m4 @@ -991,6 +991,7 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) +m4_include([../../m4/kpse-lib-version.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/libtool.m4]) m4_include([../../m4/ltoptions.m4]) diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index 0033bb81d77..8f7ee188970 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -762,8 +762,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -2356,6 +2355,7 @@ PTEXENCVERSION=1.2.0 $as_echo "#define PTEXENCVERSION \"ptexenc version 1.2.0\"" >>confdefs.h + PTEXENC_LT_VERSINFO=3:0:2 @@ -12469,39 +12469,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } if ${kpse_cv_warning_cflags+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$enable_compiler_warnings" = xno; then + if test "x$GCC" = xyes; then kpse_cv_warning_cflags= -elif test "x$GCC" = xyes; then +if test "x$enable_compiler_warnings" != xno; then kpse_cv_warning_cflags="-Wimplicit -Wreturn-type" -case `$CC -dumpversion` in #( + case `$CC -dumpversion` in #( 3.4.* | 4.*) : kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #( *) : ;; esac -case `$CC -dumpversion` in #( + case `$CC -dumpversion` in #( 3.[234].* | 4.*) : kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #( *) : ;; esac -if test "x$enable_compiler_warnings" != xmin; then - kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags" - kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations" - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" - kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings" - case `$CC -dumpversion` in #( + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings" + case `$CC -dumpversion` in #( 3.4.* | 4.*) : kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #( *) : ;; esac - if test "x$enable_compiler_warnings" != xmax; then - kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow" + fi fi fi fi +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cflags= else kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers fi diff --git a/Build/source/texk/ptexenc/configure.ac b/Build/source/texk/ptexenc/configure.ac index 8fb6e1b9932..5f5065f824e 100644 --- a/Build/source/texk/ptexenc/configure.ac +++ b/Build/source/texk/ptexenc/configure.ac @@ -5,28 +5,9 @@ dnl 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 -------------------------------------------------------- -dnl Keep ptexenc shared and package library versions the same: -dnl Only bug fixes: -dnl ptexenc_lib_micro += 1; -dnl Adding new interfaces (backwards compatible) -dnl ptexenc_lib_minor += 1; -dnl ptexenc_lib_micro = 0; -dnl Modifying or revoking interfaces (not backwards compatible) -dnl ptexenc_lib_major += 1; -dnl ptexenc_lib_minor = 0; -dnl ptexenc_lib_micro = 0; dnl -dnl After a release, set ptexenc_lib_dev to "dev", to distinguish -dnl binaries built between releases. - -m4_define([ptexenc_lib_major], [1])[]dnl -m4_define([ptexenc_lib_minor], [2])[]dnl -m4_define([ptexenc_lib_micro], [0])[]dnl -m4_define([ptexenc_lib_devel], [])[]dnl or "dev" -m4_define([ptexenc_version], [ptexenc_lib_major.ptexenc_lib_minor.ptexenc_lib_micro[]ptexenc_lib_devel])[]dnl - -AC_INIT([ptexenc], [ptexenc_version], [tex-k@tug.org]) +m4_include([version.ac])[] dnl define ptexenc_version +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,8 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4]) AC_SUBST([PTEXENCVERSION], [ptexenc_version]) AC_DEFINE([PTEXENCVERSION], ["ptexenc version ptexenc_version"]) -AC_SUBST([PTEXENC_LT_VERSINFO], - [m4_eval(ptexenc_lib_major+ptexenc_lib_minor):ptexenc_lib_micro:ptexenc_lib_minor]) +KPSE_LT_VERSION([ptexenc]) dnl Common code for all programs (or libraries) using libkpathsea. KPSE_COMMON([ptexenc]) diff --git a/Build/source/texk/ptexenc/version.ac b/Build/source/texk/ptexenc/version.ac new file mode 100644 index 00000000000..848f7b9daab --- /dev/null +++ b/Build/source/texk/ptexenc/version.ac @@ -0,0 +1,24 @@ +dnl +dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +dnl +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 +dnl -------------------------------------------------------- +dnl Keep ptexenc package and shared library versions the same: +dnl Only bug fixes: +dnl a.b.c => a.b.c+1 +dnl Adding new interfaces (backwards compatible) +dnl a.b.c => a.b+1.0 +dnl Modifying or revoking interfaces (not backwards compatible) +dnl a.b.c => a+1.b.c +dnl kpse_lib_minor = 0; +dnl kpse_lib_micro = 0; +dnl +dnl After a release: +dnl append "dev", to distinguish binaries built between releases. +dnl -------------------------------------------------------- +dnl +dnl m4-include this file to define the current ptexenc version +m4_define([ptexenc_version], [1.2.0]) |