diff options
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/Makefile.in | 3 | ||||
-rw-r--r-- | Build/source/libs/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/libs/configure | 105 | ||||
-rwxr-xr-x | Build/source/libs/graphite/configure | 63 | ||||
-rwxr-xr-x | Build/source/libs/libpng/configure | 29 | ||||
-rwxr-xr-x | Build/source/libs/poppler/configure | 57 | ||||
-rw-r--r-- | Build/source/libs/t1lib/ChangeLog | 10 | ||||
-rw-r--r-- | Build/source/libs/t1lib/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/t1lib/Makefile.in | 7 | ||||
-rw-r--r-- | Build/source/libs/t1lib/aclocal.m4 | 2 | ||||
-rwxr-xr-x | Build/source/libs/t1lib/configure | 123 | ||||
-rw-r--r-- | Build/source/libs/t1lib/configure.ac | 24 | ||||
-rw-r--r-- | Build/source/libs/t1lib/lib/t1lib/sysconf.h.in | 3 | ||||
-rw-r--r-- | Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous | 16 | ||||
-rw-r--r-- | Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c | 2 | ||||
-rw-r--r-- | Build/source/libs/t1lib/version.ac | 11 | ||||
-rwxr-xr-x | Build/source/libs/teckit/configure | 64 | ||||
-rwxr-xr-x | Build/source/libs/xpdf/configure | 57 | ||||
-rwxr-xr-x | Build/source/libs/zziplib/configure | 32 |
20 files changed, 360 insertions, 258 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 4b51a742f0d..16f1d9e192b 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../m4/kpse-lt-hack.m4 \ + $(top_srcdir)/../m4/kpse-mktex.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../m4/kpse-poppler-flags.m4 \ @@ -133,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../libs/zlib/ac/withenable.ac \ $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ $(top_srcdir)/../texk/kpathsea/ac/withenable.ac \ - $(top_srcdir)/../texk/kpathsea/ac/web2c.ac \ + $(top_srcdir)/../texk/kpathsea/ac/mktex.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index 86d2a2ce443..d784586c558 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/aclocal.m4 @@ -999,6 +999,7 @@ m4_include([../m4/kpse-icu-flags.m4]) m4_include([../m4/kpse-kpathsea-flags.m4]) m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-lt-hack.m4]) +m4_include([../m4/kpse-mktex.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-poppler-flags.m4]) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index b764e001f02..110566bbd54 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -692,13 +692,19 @@ enable_dump_share enable_ipc enable_omfonts enable_tex +enable_tex_synctex enable_etex +enable_etex_synctex enable_ptex +enable_ptex_synctex enable_eptex +enable_eptex_synctex enable_aleph enable_pdftex +enable_pdftex_synctex enable_luatex enable_xetex +enable_xetex_synctex enable_mf enable_mf_nowin with_mf_x_toolkit @@ -1472,13 +1478,19 @@ Optional Features: --disable-omfonts do not compile and install omfonts (use Web2C versions) --disable-tex do not compile and install TeX + --enable-tex-synctex build TeX with SyncTeX support --enable-etex compile and install e-TeX + --disable-etex-synctex build e-TeX without SyncTeX support --disable-ptex do not compile and install pTeX + --disable-ptex-synctex build pTeX without SyncTeX support --disable-eptex do not compile and install e-pTeX + --disable-eptex-synctex build e-pTeX without SyncTeX support --disable-aleph do not compile and install Aleph --disable-pdftex do not compile and install pdfTeX + --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install luaTeX --disable-xetex do not compile and install XeTeX + --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT --disable-mf-nowin do not build a separate non-windows-capable METAFONT @@ -3094,6 +3106,7 @@ 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 : @@ -3471,32 +3484,47 @@ if test "${enable_tex+set}" = set; then : enableval=$enable_tex; fi case $enable_tex in #( - yes|no) : + yes | no) : ;; #( *) : enable_tex=yes ;; esac + +# Check whether --enable-tex-synctex was given. +if test "${enable_tex_synctex+set}" = set; then : + enableval=$enable_tex_synctex; +fi # Check whether --enable-etex was given. if test "${enable_etex+set}" = set; then : enableval=$enable_etex; fi case $enable_etex in #( - yes|no) : + yes | no) : ;; #( *) : enable_etex=no ;; esac + +# Check whether --enable-etex-synctex was given. +if test "${enable_etex_synctex+set}" = set; then : + enableval=$enable_etex_synctex; +fi # Check whether --enable-ptex was given. if test "${enable_ptex+set}" = set; then : enableval=$enable_ptex; fi case $enable_ptex in #( - yes|no) : + yes | no) : ;; #( *) : enable_ptex=yes ;; esac +# Check whether --enable-ptex-synctex was given. +if test "${enable_ptex_synctex+set}" = set; then : + enableval=$enable_ptex_synctex; +fi + test "x$enable_web2c:$enable_ptex" = xyes:yes && { need_ptexenc=yes } @@ -3505,12 +3533,17 @@ if test "${enable_eptex+set}" = set; then : enableval=$enable_eptex; fi case $enable_eptex in #( - yes|no) : + yes | no) : ;; #( *) : enable_eptex=yes ;; esac +# Check whether --enable-eptex-synctex was given. +if test "${enable_eptex_synctex+set}" = set; then : + enableval=$enable_eptex_synctex; +fi + test "x$enable_web2c:$enable_eptex" = xyes:yes && { need_ptexenc=yes } @@ -3519,7 +3552,7 @@ if test "${enable_aleph+set}" = set; then : enableval=$enable_aleph; fi case $enable_aleph in #( - yes|no) : + yes | no) : ;; #( *) : enable_aleph=yes ;; @@ -3529,12 +3562,17 @@ if test "${enable_pdftex+set}" = set; then : enableval=$enable_pdftex; fi case $enable_pdftex in #( - yes|no) : + yes | no) : ;; #( *) : enable_pdftex=yes ;; esac +# Check whether --enable-pdftex-synctex was given. +if test "${enable_pdftex_synctex+set}" = set; then : + enableval=$enable_pdftex_synctex; +fi + test "x$enable_web2c:$enable_pdftex" = xyes:yes && { need_xpdf=yes need_libpng=yes @@ -3545,7 +3583,7 @@ if test "${enable_luatex+set}" = set; then : enableval=$enable_luatex; fi case $enable_luatex in #( - yes|no) : + yes | no) : ;; #( *) : enable_luatex=yes ;; @@ -3562,14 +3600,19 @@ if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; fi case $enable_xetex in #( - yes|no) : + yes | no) : ;; #( *) : enable_xetex=yes ;; esac +# Check whether --enable-xetex-synctex was given. +if test "${enable_xetex_synctex+set}" = set; then : + enableval=$enable_xetex_synctex; +fi + test "x$enable_web2c:$enable_xetex" = xyes:yes && { - need_xpdf=yes + need_poppler=yes need_libpng=yes need_freetype2=yes need_icu_xetex=yes @@ -4979,79 +5022,37 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" fi -## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live +## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live ## subdirectory texk/kpathsea. ## configure defaults for mktexfmt & Co. # Check whether --enable-mktexmf-default was given. if test "${enable_mktexmf_default+set}" = set; then : enableval=$enable_mktexmf_default; fi -case $enable_mktexmf_default in #( - yes|no) : - ;; #( - *) : - enable_mktexmf_default=yes ;; -esac # Check whether --enable-mktexpk-default was given. if test "${enable_mktexpk_default+set}" = set; then : enableval=$enable_mktexpk_default; fi -case $enable_mktexpk_default in #( - yes|no) : - ;; #( - *) : - enable_mktexpk_default=yes ;; -esac # Check whether --enable-mktextfm-default was given. if test "${enable_mktextfm_default+set}" = set; then : enableval=$enable_mktextfm_default; fi -case $enable_mktextfm_default in #( - yes|no) : - ;; #( - *) : - enable_mktextfm_default=yes ;; -esac # Check whether --enable-mkocp-default was given. if test "${enable_mkocp_default+set}" = set; then : enableval=$enable_mkocp_default; fi -case $enable_mkocp_default in #( - yes|no) : - ;; #( - *) : - enable_mkocp_default=yes ;; -esac # Check whether --enable-mkofm-default was given. if test "${enable_mkofm_default+set}" = set; then : enableval=$enable_mkofm_default; fi -case $enable_mkofm_default in #( - yes|no) : - ;; #( - *) : - enable_mkofm_default=yes ;; -esac # Check whether --enable-mktexfmt-default was given. if test "${enable_mktexfmt_default+set}" = set; then : enableval=$enable_mktexfmt_default; fi -case $enable_mktexfmt_default in #( - yes|no) : - ;; #( - *) : - enable_mktexfmt_default=yes ;; -esac # Check whether --enable-mktextex-default was given. if test "${enable_mktextex_default+set}" = set; then : enableval=$enable_mktextex_default; fi -case $enable_mktextex_default in #( - yes|no) : - ;; #( - *) : - enable_mktextex_default=no ;; -esac diff --git a/Build/source/libs/graphite/configure b/Build/source/libs/graphite/configure index 8e1f1f643e8..4a395c1a8d4 100755 --- a/Build/source/libs/graphite/configure +++ b/Build/source/libs/graphite/configure @@ -729,11 +729,7 @@ CPPFLAGS CCC CC CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -4423,39 +4419,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 @@ -4470,26 +4469,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } if ${kpse_cv_warning_cxxflags+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$enable_compiler_warnings" = xno; then + if test "x$GXX" = xyes; then kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then +kpse_warn_strings="-Wno-write-strings" +if test "x$enable_compiler_warnings" != xno; then kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type" -case `$CXX -dumpversion` in #( + case `$CXX -dumpversion` in #( 3.[234].* | 4.*) : kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( *) : ;; esac -if test "x$enable_compiler_warnings" != xmin; then - kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - if test "x$enable_compiler_warnings" != xmax; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align" + kpse_warn_strings="-Wwrite-strings" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi fi + fi fi +kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings" +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= else kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers fi diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure index 9fd7081b79a..976573ee59b 100755 --- a/Build/source/libs/libpng/configure +++ b/Build/source/libs/libpng/configure @@ -3838,39 +3838,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/libs/poppler/configure b/Build/source/libs/poppler/configure index ff66c944ef5..7dfcf974cde 100755 --- a/Build/source/libs/poppler/configure +++ b/Build/source/libs/poppler/configure @@ -4219,39 +4219,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 @@ -4266,26 +4269,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } if ${kpse_cv_warning_cxxflags+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$enable_compiler_warnings" = xno; then + if test "x$GXX" = xyes; then kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then +kpse_warn_strings="-Wno-write-strings" +if test "x$enable_compiler_warnings" != xno; then kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type" -case `$CXX -dumpversion` in #( + case `$CXX -dumpversion` in #( 3.[234].* | 4.*) : kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( *) : ;; esac -if test "x$enable_compiler_warnings" != xmin; then - kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - if test "x$enable_compiler_warnings" != xmax; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align" + kpse_warn_strings="-Wwrite-strings" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi fi + fi fi +kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings" +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= else kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers fi diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog index fcedc725b41..ef39712f28f 100644 --- a/Build/source/libs/t1lib/ChangeLog +++ b/Build/source/libs/t1lib/ChangeLog @@ -1,3 +1,13 @@ +2011-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use KPSE_COMPILER_WARNINGS. + * Makefile.am [AM_CFLAGS]: Prepare for WARNING_CFLAGS. + +2011-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * version.ac: New file defining the t1lib version. + * configure.ac: Adapt. Drom useless AC_HEADER_STAT. + 2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Do not compile lib/type1/bstring.c. diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am index e1c720bcdb0..4da83c2894b 100644 --- a/Build/source/libs/t1lib/Makefile.am +++ b/Build/source/libs/t1lib/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build t1lib for TeX Live. ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -38,7 +38,7 @@ AM_CPPFLAGS = $(T1LIB_DEFINES) AM_CPPFLAGS += -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" AM_CPPFLAGS += -DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\" -AM_CFLAGS = $(T1LIB_CFLAGS) +AM_CFLAGS = $(T1LIB_CFLAGS) # $(WARNING_CFLAGS) LDADD = libt1.a diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in index 1413c9a1e1b..5d4cf84ab29 100644 --- a/Build/source/libs/t1lib/Makefile.in +++ b/Build/source/libs/t1lib/Makefile.in @@ -46,7 +46,9 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/ltmain.sh ../../build-aux/missing \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-lib-version.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -159,6 +161,7 @@ T1LIB_VERSIONSTRING = @T1LIB_VERSIONSTRING@ T1_INT16 = @T1_INT16@ T1_INT32 = @T1_INT32@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -207,7 +210,7 @@ EXTRA_DIST = $(T1LIB_TREE) $(T1LIB_TREE)-PATCHES l047016t.pfa \ INCLUDES = -Ilib -I$(top_srcdir)/$(T1LIB_TREE) AM_CPPFLAGS = $(T1LIB_DEFINES) -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \ -DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\" -AM_CFLAGS = $(T1LIB_CFLAGS) +AM_CFLAGS = $(T1LIB_CFLAGS) # $(WARNING_CFLAGS) LDADD = libt1.a noinst_LIBRARIES = libt1.a nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources) diff --git a/Build/source/libs/t1lib/aclocal.m4 b/Build/source/libs/t1lib/aclocal.m4 index 76a153698ad..2388a607fe9 100644 --- a/Build/source/libs/t1lib/aclocal.m4 +++ b/Build/source/libs/t1lib/aclocal.m4 @@ -989,3 +989,5 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../../m4/kpse-lib-version.m4]) +m4_include([../../m4/kpse-warnings.m4]) diff --git a/Build/source/libs/t1lib/configure b/Build/source/libs/t1lib/configure index 4d34ff7c879..f4ccb0014c4 100755 --- a/Build/source/libs/t1lib/configure +++ b/Build/source/libs/t1lib/configure @@ -615,6 +615,7 @@ T1_INT16 EGREP GREP CPP +WARNING_CFLAGS RANLIB am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -707,6 +708,7 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode enable_dependency_tracking +enable_compiler_warnings ' ac_precious_vars='build_alias host_alias @@ -716,8 +718,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -1339,6 +1340,9 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-compiler-warnings=[no|min|yes|max|all] + Turn on compiler warnings [default: yes if + maintainer-mode, min otherwise] Some influential environment variables: CC C compiler command @@ -2739,9 +2743,6 @@ T1LIB_PATCHLEVEL=2 T1LIB_VERSIONSTRING='"5.1.2"' - - - ac_config_headers="$ac_config_headers lib/t1lib/sysconf.h" @@ -3827,6 +3828,76 @@ else fi +# Check whether --enable-compiler-warnings was given. +if test "${enable_compiler_warnings+set}" = set; then : + enableval=$enable_compiler_warnings; +fi +case $enable_compiler_warnings in #( + no | min | yes | max | all) : + ;; #( + *) : + if test "x$enable_maintainer_mode" = xyes; then : + enable_compiler_warnings=yes +else + enable_compiler_warnings=min +fi ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +$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$GCC" = xyes; then + kpse_cv_warning_cflags= +if test "x$enable_compiler_warnings" != xno; then + kpse_cv_warning_cflags="-Wimplicit -Wreturn-type" + case `$CC -dumpversion` in #( + 3.4.* | 4.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #( + *) : + ;; +esac + 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 #( + 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" + 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 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cflags" >&5 +$as_echo "$kpse_cv_warning_cflags" >&6; } +WARNING_CFLAGS=$kpse_cv_warning_cflags + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 $as_echo_n "checking for library containing sqrt... " >&6; } @@ -4693,48 +4764,6 @@ T1LIB_DATA_DIR="${datadir}/t1lib" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 -$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } -if ${ac_cv_header_stat_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <sys/stat.h> - -#if defined S_ISBLK && defined S_IFDIR -extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; -#endif - -#if defined S_ISBLK && defined S_IFCHR -extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; -#endif - -#if defined S_ISLNK && defined S_IFREG -extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; -#endif - -#if defined S_ISSOCK && defined S_IFREG -extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stat_broken=no -else - ac_cv_header_stat_broken=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 -$as_echo "$ac_cv_header_stat_broken" >&6; } -if test $ac_cv_header_stat_broken = yes; then - -$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } if ${ac_cv_c_const+:} false; then : diff --git a/Build/source/libs/t1lib/configure.ac b/Build/source/libs/t1lib/configure.ac index 35e7d6c40fd..d67ce3cba3e 100644 --- a/Build/source/libs/t1lib/configure.ac +++ b/Build/source/libs/t1lib/configure.ac @@ -1,15 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 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 -m4_define([t1lib_major], [5])[]dnl -m4_define([t1lib_minor], [1])[]dnl -m4_define([t1lib_micro], [2])[]dnl using unmodified t1lib-5.1.2 source tree -m4_define([t1lib_version], t1lib_major.t1lib_minor.t1lib_micro)[]dnl +m4_include([version.ac])[] dnl define t1lib_version AC_INIT([T1lib for TeX Live], t1lib_version, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([t1lib-]t1lib_version[/lib/t1lib/t1base.c]) @@ -19,16 +16,12 @@ AC_CONFIG_MACRO_DIR([../../m4]) AM_INIT_AUTOMAKE([foreign no-define]) AM_MAINTAINER_MODE -T1LIB_VERSION=t1lib_major() -T1LIB_REVISION=t1lib_minor() -T1LIB_PATCHLEVEL=t1lib_micro() -T1LIB_VERSIONSTRING='"t1lib_major.t1lib_minor.t1lib_micro"' -AC_SUBST([T1LIB_VERSION]) -AC_SUBST([T1LIB_REVISION]) -AC_SUBST([T1LIB_PATCHLEVEL]) -AC_SUBST([T1LIB_VERSIONSTRING]) +KPSE_LIB_VERSION([t1lib])[]dnl +AC_SUBST([T1LIB_VERSION], [t1lib_major])[]dnl +AC_SUBST([T1LIB_REVISION], [t1lib_minor])[]dnl +AC_SUBST([T1LIB_PATCHLEVEL], [t1lib_micro])[]dnl +AC_SUBST([T1LIB_VERSIONSTRING], '"t1lib_version"') -dnl AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([lib/t1lib/sysconf.h]) AM_CONDITIONAL([build], [test "x$enable_build" != xno]) @@ -38,6 +31,8 @@ dnl **** Check for some programs and libraries **** AC_PROG_CC AC_PROG_RANLIB +KPSE_COMPILER_WARNINGS + AC_SEARCH_LIBS([sqrt], [m]) dnl **** Check for some compiler/system characteristics @@ -115,7 +110,6 @@ AC_SUBST([T1LIB_DATA_DIR]) dnl **** Check for functions and header files **** -AC_HEADER_STAT() AC_C_CONST() AC_TYPE_SIZE_T() diff --git a/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in b/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in index e5face53a28..940ada381ed 100644 --- a/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in +++ b/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in @@ -72,9 +72,6 @@ /* The size of `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P -/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ -#undef STAT_MACROS_BROKEN - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog index fef1131b818..943aff3f445 100644 --- a/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog +++ b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-ambiguous (new): Fix braces added to avoid + `ambiguous else' warning (compare libXfont 1.3.x from XOrg-7.4). + 2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-01-buffer-limit (new): Avoid buffer overflow in diff --git a/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous new file mode 100644 index 00000000000..473a2716f9e --- /dev/null +++ b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous @@ -0,0 +1,16 @@ +diff -ur t1lib-5.1.2.orig/lib/type1/type1.c t1lib-5.1.2/lib/type1/type1.c +--- t1lib-5.1.2.orig/lib/type1/type1.c 2007-12-23 16:49:42.000000000 +0100 ++++ t1lib-5.1.2/lib/type1/type1.c 2011-07-19 21:34:40.000000000 +0200 +@@ -843,11 +843,11 @@ + if (stemtop >= alignmentzones[i].bottomy + blues->BlueShift){ + enforceovershoot = TRUE; + } ++ } + else + if (stembottom <= alignmentzones[i].topy - blues->BlueShift){ + enforceovershoot = TRUE; + } +- } + } + + diff --git a/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c b/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c index 392016c690e..78e842bb2ee 100644 --- a/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c +++ b/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c @@ -843,11 +843,11 @@ int stemno; if (stemtop >= alignmentzones[i].bottomy + blues->BlueShift){ enforceovershoot = TRUE; } + } else if (stembottom <= alignmentzones[i].topy - blues->BlueShift){ enforceovershoot = TRUE; } - } } diff --git a/Build/source/libs/t1lib/version.ac b/Build/source/libs/t1lib/version.ac new file mode 100644 index 00000000000..b7337e9d011 --- /dev/null +++ b/Build/source/libs/t1lib/version.ac @@ -0,0 +1,11 @@ +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 +dnl m4-include this file to define the current t1lib version +m4_define([t1lib_version], [5.1.2]) diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure index 57d81f2ea5b..d544f2f3518 100755 --- a/Build/source/libs/teckit/configure +++ b/Build/source/libs/teckit/configure @@ -738,13 +738,8 @@ CPPFLAGS CCC CC CFLAGS -LDFLAGS -LIBS -CPPFLAGS CXXCPP -CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -4456,39 +4451,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 @@ -4503,26 +4501,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } if ${kpse_cv_warning_cxxflags+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$enable_compiler_warnings" = xno; then + if test "x$GXX" = xyes; then kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then +kpse_warn_strings="-Wno-write-strings" +if test "x$enable_compiler_warnings" != xno; then kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type" -case `$CXX -dumpversion` in #( + case `$CXX -dumpversion` in #( 3.[234].* | 4.*) : kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( *) : ;; esac -if test "x$enable_compiler_warnings" != xmin; then - kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - if test "x$enable_compiler_warnings" != xmax; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align" + kpse_warn_strings="-Wwrite-strings" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi fi + fi fi +kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings" +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= else kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers fi diff --git a/Build/source/libs/xpdf/configure b/Build/source/libs/xpdf/configure index 8b3033207b2..b55ac9ca23f 100755 --- a/Build/source/libs/xpdf/configure +++ b/Build/source/libs/xpdf/configure @@ -4200,39 +4200,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 @@ -4247,26 +4250,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } if ${kpse_cv_warning_cxxflags+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$enable_compiler_warnings" = xno; then + if test "x$GXX" = xyes; then kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then +kpse_warn_strings="-Wno-write-strings" +if test "x$enable_compiler_warnings" != xno; then kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type" -case `$CXX -dumpversion` in #( + case `$CXX -dumpversion` in #( 3.[234].* | 4.*) : kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( *) : ;; esac -if test "x$enable_compiler_warnings" != xmin; then - kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - if test "x$enable_compiler_warnings" != xmax; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align" + kpse_warn_strings="-Wwrite-strings" + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi fi + fi fi +kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings" +elif test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= else kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers fi diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure index b5024233441..03b3cb0d981 100755 --- a/Build/source/libs/zziplib/configure +++ b/Build/source/libs/zziplib/configure @@ -727,8 +727,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -4103,39 +4102,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 |