From 273ed9c5b194dca51ed972db8071522d60733284 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 15 Jun 2009 15:10:25 +0000 Subject: implement compiler warnings git-svn-id: svn://tug.org/texlive/trunk@13751 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/detex/configure.ac | 2 +- Build/source/texk/dvipdfmx/configure.ac | 7 +- Build/source/texk/dvipng/configure.ac | 109 ++++++++++++++++++++------ Build/source/texk/dvipsk/configure.ac | 2 +- Build/source/texk/dvipsk/squeeze/configure.ac | 2 + Build/source/texk/lacheck/configure.ac | 2 +- Build/source/texk/lcdf-typetools/configure.ac | 13 +-- Build/source/texk/web2c/configure.ac | 2 +- Build/source/texk/xdvik/configure.ac | 2 +- Build/source/texk/xdvik/squeeze/configure.ac | 2 + Build/source/texk/xdvipdfmx/configure.ac | 9 +-- 11 files changed, 108 insertions(+), 44 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/detex/configure.ac b/Build/source/texk/detex/configure.ac index 2413e4c1c09..be222471249 100644 --- a/Build/source/texk/detex/configure.ac +++ b/Build/source/texk/detex/configure.ac @@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([detex]) -KPSE_PROG_LEX +AC_PROG_LEX AC_HEADER_TIME AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac index 113583e2d51..a7425d5c261 100644 --- a/Build/source/texk/dvipdfmx/configure.ac +++ b/Build/source/texk/dvipdfmx/configure.ac @@ -57,10 +57,9 @@ CHO_CHECK_LIBPNG KPSE_RESTORE_FLAGS -dnl We do not provide the configure option '--enable-tetex-build', but may -dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. -dnl If not, check for libpaper. -if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then +dnl Check for additional libraries. + +if test "x$enable_texlive_build" != xyes || test ! -d $srdir/../kpathsea; then CHO_CHECK_LIBPAPER fi diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 153cb8538fa..76c9f6e5dca 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -40,9 +40,9 @@ AC_CONFIG_SRCDIR([dvipng.c]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) -dnl Common code for all programs using libkpathsea. +# Common code for all programs using libkpathsea. KPSE_COMMON([dvipng]) - +# Configure options for dvipng also shown at the TeX Live top-level. m4_include([ac/dvipng.ac]) if test "x$enable_debug" != xno; then @@ -54,29 +54,38 @@ if test "x$enable_timing" = xyes; then AC_DEFINE([TIMING], 1, [Define as 1 to get execution time output.]) fi -dnl Checks for programs. -dnl FIXME -AC_DEFINE_UNQUOTED([GS_PATH], ["gs"], [Define as the path to GhostScript.]) +# Checks for programs. +# For a native TeX Live build '--with-gs' is ignored. +AS_IF([test "x$enable_native_texlive_build" = xyes], + [with_gs=]) +AS_CASE([$with_gs], + ["" | yes | no], [AC_CHECK_PROG([GS], [gs], [gs])], + [AC_PATH_PROG([GS], ["$with_gs"])]) +AS_IF([test -n "$GS"], + [GS_CHECK_DEVICES], + [AC_MSG_WARN([Cannot find GhostScript in your PATH]) + GS=gs]) +AC_DEFINE_UNQUOTED([GS_PATH], ["$GS"], [Define as the path to GhostScript.]) -dnl Checks for libraries. +# Checks for libraries. AC_SEARCH_LIBS([pow], [m]) AC_SEARCH_LIBS([basename], [gen]) -dnl Checks for header files. +# Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h sys/time.h]) AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_HEADER_STDBOOL -dnl Checks for typedefs, structures, and compiler characteristics. +# Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_PID_T AC_TYPE_SIZE_T AC_TYPE_INT64_T AC_TYPE_UINT64_T -dnl Checks for library functions. +# Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_FORK AC_FUNC_MALLOC @@ -89,11 +98,72 @@ if test "x$enable_timing" = xyes; then AC_CHECK_FUNCS([ftime gettimeofday]) fi -dnl Documentation-related checks. +# Documentation-related checks. AC_PATH_PROG([MAKEINFO], [makeinfo], [:]) MAKEINFO_CHECK_MACROS([acronym env option]) AC_PATH_PROG([INSTALL_INFO], [install-info], [:], [$PATH /usr/sbin /sbin]) +# SELFAUTO +# When dvipng is built as part of the TeX Live tree, the option +# '--enable-texlive-build' is automatically passed from the top-level. +# In that case we silently assume '--disable-selfauto-set'. +test "x$enable_texlive_build" = xyes && enable_selfauto_set=no +AC_ARG_ENABLE([selfauto-set], + AC_HELP_STRING([--enable-selfauto-set], + [This option will make the final binary explicitly set the + $SELFAUTO... variables to make it look as dvipng is installed in the + main texmf tree, even if it isn't. This is necessary when texmf.cnf + only uses $SELFAUTO... variables and dvipng is not installed in the + texmf tree. Otherwise, dvipng may not be able to find virtual + fonts, or psfonts.map. To find out, first build the binary and do + 'make test'. If the test fails, you need this switch.]), + [ if test "$enableval" = yes ; then + AC_MSG_CHECKING([for \$SELFAUTOLOC]) + SELFAUTOLOC=`kpsewhich -expand-var=\\\$SELFAUTOLOC` + AC_DEFINE_UNQUOTED([ENV_SELFAUTOLOC], ["SELFAUTOLOC=$SELFAUTOLOC"], + [The environment setting for $SELFAUTOLOC]) + AC_MSG_RESULT([$SELFAUTOLOC]) + AC_MSG_CHECKING([for \$SELFAUTODIR]) + SELFAUTODIR=`kpsewhich -expand-var=\\\$SELFAUTODIR` + AC_DEFINE_UNQUOTED([ENV_SELFAUTODIR], ["SELFAUTODIR=$SELFAUTODIR"], + [The environment setting for $SELFAUTODIR]) + AC_MSG_RESULT([$SELFAUTODIR]) + AC_MSG_CHECKING([for \$SELFAUTOPARENT]) + SELFAUTOPARENT=`kpsewhich -expand-var=\\\$SELFAUTOPARENT` + AC_DEFINE_UNQUOTED([ENV_SELFAUTOPARENT], ["SELFAUTOPARENT=$SELFAUTOPARENT"], + [The environment setting for $SELFAUTOPARENT]) + AC_MSG_RESULT([$SELFAUTOPARENT]) + fi ], + [AC_MSG_CHECKING([for texmf.cnf]) + TEXMF_CNF=`kpsewhich texmf.cnf` + AC_MSG_RESULT([$TEXMF_CNF]) + AC_PATH_PROG([KPSEWHICH], [kpsewhich]) + AC_MSG_CHECKING([for psfonts.map]) + cp $KPSEWHICH . + PSFONTS_MAP=`./kpsewhich psfonts.map` + rm -f ./kpsewhich + if test -n "$PSFONTS_MAP"; then + AC_MSG_RESULT([$PSFONTS_MAP]) + else + AC_MSG_RESULT([not found from outside the texmf tree]) + AC_MSG_CHECKING([for \$SELFAUTO in texmf.cnf]) + if grep SELFAUTO "$TEXMF_CNF" > /dev/null 2> /dev/null; then + AC_MSG_RESULT([yes +*************************************************************** +texmf.cnf is using \$SELFAUTO... variables. If you are going to +install dvipng outside the texmf tree, you may need to use +--enable-selfauto-set. To find out, do 'make ; make test'. If the test +is unsuccessful, add the mentioned switch and rebuild. +***************************************************************]) + else + AC_MSG_RESULT([no]) + fi + fi]) + +# We have to check properties of libraries, either installed (system) +# libraries or unistalled (possibly libtool) ones from the TeX Live tree. +# Thus we can not use, e.g., AC_CHECK_LIB(LIB, FUNCTION) + KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS @@ -101,11 +171,7 @@ KPSE_T1LIB_FLAGS KPSE_FREETYPE2_FLAGS KPSE_GD_FLAGS -dnl We have to check properties of libraries, either installed (system) -dnl libraries or unistalled (possibly libtool) ones from the TL tree. -dnl Thus we can not use, e.g., AC_CHECK_LIB(LIB, FUNCTION) - -dnl Checks for more libraries. +# Checks for more libraries. KPSE_ADD_FLAGS([zlib]) AC_CHECK_FUNC([deflate], [AC_DEFINE([HAVE_LIBZ], 1, @@ -131,8 +197,8 @@ AC_CHECK_FUNC([kpse_set_progname], [Define to 1 if you have the `kpathsea' library (-lkpathsea).])], [KPSE_MSG_ERROR([dvipng], [cannot find/use libkpathsea])]) -dnl We need enc, cmap, and sfd formats. -dnl Introduced together with opentype format (Dec 2003). +# We need enc, cmap, and sfd formats. +# Introduced together with opentype format (Dec 2003). KPSE_CHECK_KPSE_FORMAT([opentype], [AC_DEFINE([HAVE_KPSE_ENC_FORMATS], 1, [Define to 1 if your kpathsea has kpse_enc_format.])]) @@ -153,21 +219,18 @@ AC_CHECK_FUNC([FT_Init_FreeType], AM_CONDITIONAL([have_ft2], [test "x$ac_cv_func_FT_Init_FreeType" = xyes]) AM_CONDITIONAL([have_ft2_or_t1], [test "x$have_ft2_or_t1" = xyes]) -dnl Checks for more header files. +# Checks for more header files. AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h], , [KPSE_MSG_ERROR([dvipng], [cannot find/use $ac_header])]) AC_CHECK_HEADERS([t1lib.h]) -dnl Checks for library functions. +# Checks for more library functions. AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif FT_Library_Version]) AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes]) KPSE_RESTORE_FLAGS -DVIPNG_VERSION=dvipng_version -AC_SUBST([DVIPNG_VERSION]) - AC_MSG_RESULT([ ** Configuration summary for $PACKAGE_STRING: @@ -193,6 +256,6 @@ AC_MSG_RESULT([ AC_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile help/Makefile doc/Makefile]) AC_OUTPUT diff --git a/Build/source/texk/dvipsk/configure.ac b/Build/source/texk/dvipsk/configure.ac index 122f6acec88..3f1e204ceb9 100644 --- a/Build/source/texk/dvipsk/configure.ac +++ b/Build/source/texk/dvipsk/configure.ac @@ -28,7 +28,7 @@ AC_CONFIG_SUBDIRS([squeeze]) AC_CONFIG_FILES([Makefile]) dnl The subdirectory squeeze must be configured for the build system. -dnl Can not share the cache file with the subdirectory! +dnl When cross compiling, can not share the cache file with the subdirectory! AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], [cache_file=/dev/null ac_configure_args="$ac_configure_args --host='$build' \ diff --git a/Build/source/texk/dvipsk/squeeze/configure.ac b/Build/source/texk/dvipsk/squeeze/configure.ac index b7cc052fead..f4fdf66aa03 100644 --- a/Build/source/texk/dvipsk/squeeze/configure.ac +++ b/Build/source/texk/dvipsk/squeeze/configure.ac @@ -17,6 +17,8 @@ AM_MAINTAINER_MODE AC_PROG_CC +KPSE_COMPILER_WARNINGS + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/lacheck/configure.ac b/Build/source/texk/lacheck/configure.ac index d9994b3fb27..b2f703c86bb 100644 --- a/Build/source/texk/lacheck/configure.ac +++ b/Build/source/texk/lacheck/configure.ac @@ -19,7 +19,7 @@ AC_SUBST([REV]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([lacheck]) -KPSE_PROG_LEX +AC_PROG_LEX AC_CONFIG_HEADERS([config.h]) diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index e149f840280..cc988adfad7 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -47,12 +47,13 @@ dnl dnl kpathsea dnl -AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX installation], :, enable_tetex_build=no) +AC_ARG_ENABLE([texlive-build], + AS_HELP_STRING([--enable-texlive-build], + [build as part of a TeX Live installation]), + [:], + [enable_texlive_build=no]) -dnl FIXME: -test -d $srcdir/../kpathsea && enable_tetex_build=yes - -AM_CONDITIONAL([tetex_build], [test "x$enable_tetex_build" = xyes]) +AM_CONDITIONAL([texlive_build], [test "x$enable_texlive_build" = xyes]) AC_ARG_WITH([kpathsea], AS_HELP_STRING([--without-kpathsea], @@ -90,7 +91,7 @@ KPSE_RESTORE_FLAGS AC_ARG_ENABLE(selfauto-set, [ --disable-selfauto-set disable setting SELFAUTO variables from kpsewhich], :, enable_selfauto_set=yes) -if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_tetex_build" != xyes; then +if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then kpsewhich='kpsewhich' test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index af1db20d367..2617229d7bc 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -356,7 +356,7 @@ AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile window/Makefile]) dnl The subdirectory web2c must be configured for the build system. -dnl Can not share the cache file with the subdirectory! +dnl When cross compiling, can not share the cache file with the subdirectory! AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], [cache_file=/dev/null ac_configure_args="$ac_configure_args --host='$build' \ diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac index 17d8896571f..a00f2320ef3 100644 --- a/Build/source/texk/xdvik/configure.ac +++ b/Build/source/texk/xdvik/configure.ac @@ -299,7 +299,7 @@ AC_CONFIG_FILES([Makefile tests/Makefile]) AC_CONFIG_FILES([xdvi:xdvi-sh.in], [chmod +x xdvi]) dnl The subdirectory squeeze must be configured for the build system. -dnl Can not share the cache file with the subdirectory! +dnl When cross compiling, can not share the cache file with the subdirectory! AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], [cache_file=/dev/null ac_configure_args="$ac_configure_args --host='$build' \ diff --git a/Build/source/texk/xdvik/squeeze/configure.ac b/Build/source/texk/xdvik/squeeze/configure.ac index ed97b7d6845..a2df4779565 100644 --- a/Build/source/texk/xdvik/squeeze/configure.ac +++ b/Build/source/texk/xdvik/squeeze/configure.ac @@ -17,6 +17,8 @@ AM_MAINTAINER_MODE AC_PROG_CC +KPSE_COMPILER_WARNINGS + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index 42db8cd80ee..280c10f4089 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -61,15 +61,12 @@ CHO_CHECK_LIBFREETYPE([xdvipdfmx]) KPSE_RESTORE_FLAGS -dnl We do not provide the configure option '--enable-tetex-build', but may -dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. -dnl If not, check for libpaper. -if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then +dnl Check for additional libraries. + +if test "x$enable_texlive_build" != xyes || test ! -d $srdir/../kpathsea; then CHO_CHECK_LIBPAPER fi -dnl Check for additional libraries. - KPSE_CHECK_FRAMEWORK([ApplicationServices], [ATSFontRef fontRef]) KPSE_FONTCONFIG_FLAGS if test "x$kpse_cv_have_ApplicationServices" = xyes; then -- cgit v1.2.3