From 326e9421dd2dadce9ce02577212d4966f8fc30e1 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 17 Jun 2009 08:05:07 +0000 Subject: minor build system fix git-svn-id: svn://tug.org/texlive/trunk@13778 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 26 +------------------------- Build/source/m4/kpse-freetype2-flags.m4 | 2 +- Build/source/m4/kpse-warnings.m4 | 1 + Build/source/texk/dvipng/configure | 2 +- Build/source/texk/lcdf-typetools/configure | 24 ------------------------ Build/source/texk/web2c/configure | 26 +------------------------- Build/source/texk/xdv2pdf/configure | 24 ------------------------ Build/source/texk/xdvipdfmx/configure | 2 +- 8 files changed, 6 insertions(+), 101 deletions(-) (limited to 'Build/source') diff --git a/Build/source/configure b/Build/source/configure index 24efa74ddc7..6b9333b2820 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -20380,30 +20380,6 @@ 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:$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 test "${kpse_cv_warning_cxxflags+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$enable_compiler_warnings" = xno; then - kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then - kpse_cv_warning_cxxflags="-Wall -Wunused" - if test "x$enable_compiler_warnings" != xmin; then - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wimplicit -Wparentheses -Wreturn-type" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - fi -else - : # FIXME: warning flags for non-g++ compilers -fi -fi -{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cxxflags" >&5 -$as_echo "$kpse_cv_warning_cxxflags" >&6; } -WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags - { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 @@ -20594,7 +20570,7 @@ fi if $FT2_CONFIG --ftversion >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then +elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 $as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} { (exit 1); exit 1; }; } diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 138dc025941..90b71a45fa4 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -40,7 +40,7 @@ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], if $FT2_CONFIG --ftversion >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then +elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then AC_MSG_ERROR([did not find freetype-config required for system freetype2 library]) fi ]) # KPSE_FREETYPE2_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-warnings.m4 b/Build/source/m4/kpse-warnings.m4 index 545bcb6d3af..fdc8d4bc2dc 100644 --- a/Build/source/m4/kpse-warnings.m4 +++ b/Build/source/m4/kpse-warnings.m4 @@ -107,5 +107,6 @@ else fi]) WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags AC_SUBST([WARNING_CXXFLAGS]) +m4_define([_KPSE_WARNING_CXXFLAGS], [])[]dnl ]) # _KPSE_WARNING_CXXFLAGS diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 447989bc2c1..6a20053be4c 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -18593,7 +18593,7 @@ if test "x$with_system_freetype2" = xyes; then if $FT2_CONFIG --ftversion >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then +elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 $as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} { (exit 1); exit 1; }; } diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 3f15d3b17a5..9e4370364e6 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -17186,30 +17186,6 @@ 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:$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 test "${kpse_cv_warning_cxxflags+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$enable_compiler_warnings" = xno; then - kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then - kpse_cv_warning_cxxflags="-Wall -Wunused" - if test "x$enable_compiler_warnings" != xmin; then - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wimplicit -Wparentheses -Wreturn-type" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - fi -else - : # FIXME: warning flags for non-g++ compilers -fi -fi -{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cxxflags" >&5 -$as_echo "$kpse_cv_warning_cxxflags" >&6; } -WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index ccb14272a48..54de4202bc0 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -17368,30 +17368,6 @@ 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:$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 test "${kpse_cv_warning_cxxflags+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$enable_compiler_warnings" = xno; then - kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then - kpse_cv_warning_cxxflags="-Wall -Wunused" - if test "x$enable_compiler_warnings" != xmin; then - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wimplicit -Wparentheses -Wreturn-type" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - fi -else - : # FIXME: warning flags for non-g++ compilers -fi -fi -{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cxxflags" >&5 -$as_echo "$kpse_cv_warning_cxxflags" >&6; } -WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags - # Check whether --enable-cxx-runtime-hack was given. if test "${enable_cxx_runtime_hack+set}" = set; then @@ -24353,7 +24329,7 @@ if test "x$with_system_freetype2" = xyes; then if $FT2_CONFIG --ftversion >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then +elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 $as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} { (exit 1); exit 1; }; } diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure index 54cb3fbaf1b..dc29fc434f9 100755 --- a/Build/source/texk/xdv2pdf/configure +++ b/Build/source/texk/xdv2pdf/configure @@ -17157,30 +17157,6 @@ 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:$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 test "${kpse_cv_warning_cxxflags+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$enable_compiler_warnings" = xno; then - kpse_cv_warning_cxxflags= -elif test "x$GXX" = xyes; then - kpse_cv_warning_cxxflags="-Wall -Wunused" - if test "x$enable_compiler_warnings" != xmin; then - if test "x$enable_compiler_warnings" != xyes; then - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wimplicit -Wparentheses -Wreturn-type" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith" - kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" - fi - fi -else - : # FIXME: warning flags for non-g++ compilers -fi -fi -{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cxxflags" >&5 -$as_echo "$kpse_cv_warning_cxxflags" >&6; } -WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags - ac_ext=m ac_cpp='$OBJCPP $CPPFLAGS' diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 3b875e1affb..7908a799d02 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -17567,7 +17567,7 @@ if test "x$with_system_freetype2" = xyes; then if $FT2_CONFIG --ftversion >/dev/null 2>&1; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then +elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 $as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} { (exit 1); exit 1; }; } -- cgit v1.2.3