diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-03 10:07:19 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-03 10:07:19 +0000 |
commit | cd0ab8cca8720fb6230858653c52847f7f49a6cb (patch) | |
tree | 72fa6ba32b3c571cb9725eebe15859843f05a68a /Build/source/texk/dvipng | |
parent | a097a42d71e755e4b784eb6711c00d754dd1d193 (diff) |
build system: minor update
git-svn-id: svn://tug.org/texlive/trunk@16910 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r-- | Build/source/texk/dvipng/ChangeLog | 4 | ||||
-rwxr-xr-x | Build/source/texk/dvipng/configure | 47 | ||||
-rw-r--r-- | Build/source/texk/dvipng/configure.ac | 28 |
3 files changed, 27 insertions, 52 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 61dd8aacf7b..fe937349f88 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2010-02-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Fix 'on demand' build. + 2010-01-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Rearrange for 'on demand' build. diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 7c83efd555f..e4403fc232a 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -11613,7 +11613,7 @@ case `$CC -dumpversion` in #( ;; esac if test "x$enable_compiler_warnings" != xmin; then - kpse_cv_warning_cflags="-Wall -Wunused -Wimplicit $kpse_cv_warning_cflags" + 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" @@ -15004,6 +15004,10 @@ ${top_builddir}/../../libs/gd/include/gd.h: fi +# Assume we have t1lib and freetype2. +have_t1=yes +have_ft2=yes + if test "x$enable_build" != xno || test -f config.force; then # Checks for more libraries. @@ -15039,12 +15043,11 @@ eval LIBS=\"$T1LIB_LIBS \$LIBS\" ac_fn_c_check_func "$LINENO" "T1_InitLib" "ac_cv_func_T1_InitLib" if test "x$ac_cv_func_T1_InitLib" = x""yes; then : - have_ft2_or_t1=yes $as_echo "#define HAVE_LIBT1 1" >>confdefs.h else - have_ft2_or_t1=no + have_t1=no fi @@ -15053,10 +15056,11 @@ eval LIBS=\"$FREETYPE2_LIBS \$LIBS\" ac_fn_c_check_func "$LINENO" "FT_Init_FreeType" "ac_cv_func_FT_Init_FreeType" if test "x$ac_cv_func_FT_Init_FreeType" = x""yes; then : - have_ft2_or_t1=yes $as_echo "#define HAVE_FT2 1" >>confdefs.h +else + have_ft2=no fi @@ -15173,30 +15177,9 @@ LIBS=$kpse_save_LIBS echo timestamp >config.force -else - -# For TeX Live we always have t1lib and freetype2. - if true; then - have_t1_TRUE= - have_t1_FALSE='#' -else - have_t1_TRUE='#' - have_t1_FALSE= fi - if true; then - have_ft2_TRUE= - have_ft2_FALSE='#' -else - have_ft2_TRUE='#' - have_ft2_FALSE= -fi - -have_ft2_or_t1=yes - -fi - - if test "x$ac_cv_func_T1_InitLib" = xyes; then + if test "x$have_t1" = xyes; then have_t1_TRUE= have_t1_FALSE='#' else @@ -15204,7 +15187,7 @@ else have_t1_FALSE= fi - if test "x$ac_cv_func_FT_Init_FreeType" = xyes; then + if test "x$have_ft2" = xyes; then have_ft2_TRUE= have_ft2_FALSE='#' else @@ -15212,7 +15195,7 @@ else have_ft2_FALSE= fi - if test "x$have_ft2_or_t1" = xyes; then + if test "x$have_ft2:$have_t1" != xno:no; then have_ft2_or_t1_TRUE= have_ft2_or_t1_FALSE='#' else @@ -15408,14 +15391,6 @@ if test -z "${have_ft2_TRUE}" && test -z "${have_ft2_FALSE}"; then as_fn_error "conditional \"have_ft2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${have_t1_TRUE}" && test -z "${have_t1_FALSE}"; then - as_fn_error "conditional \"have_t1\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${have_ft2_TRUE}" && test -z "${have_ft2_FALSE}"; then - as_fn_error "conditional \"have_ft2\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${have_ft2_or_t1_TRUE}" && test -z "${have_ft2_or_t1_FALSE}"; then as_fn_error "conditional \"have_ft2_or_t1\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index afece4cf058..99cbf09632f 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -96,6 +96,10 @@ KPSE_T1LIB_FLAGS KPSE_FREETYPE2_FLAGS KPSE_GD_FLAGS +# Assume we have t1lib and freetype2. +have_t1=yes +have_ft2=yes + if test "x$enable_build" != xno || test -f config.force; then # Checks for more libraries. @@ -112,16 +116,15 @@ AC_CHECK_FUNC([png_read_image], KPSE_ADD_FLAGS([t1lib]) AC_CHECK_FUNC([T1_InitLib], - [have_ft2_or_t1=yes - AC_DEFINE([HAVE_LIBT1], 1, + [AC_DEFINE([HAVE_LIBT1], 1, [Define to 1 if you have the `t1' library (-lt1).])], - [have_ft2_or_t1=no]) + [have_t1=no]) KPSE_ADD_FLAGS([freetype2]) AC_CHECK_FUNC([FT_Init_FreeType], - [have_ft2_or_t1=yes - AC_DEFINE([HAVE_FT2], 1, - [Define to 1 if you have freetype2.])]) + [AC_DEFINE([HAVE_FT2], 1, + [Define to 1 if you have freetype2.])], + [have_ft2=no]) KPSE_ADD_FLAGS([gd]) AC_CHECK_FUNC([gdImageCreate], @@ -154,18 +157,11 @@ KPSE_RESTORE_FLAGS echo timestamp >config.force -else - -# For TeX Live we always have t1lib and freetype2. -AM_CONDITIONAL([have_t1], [true]) -AM_CONDITIONAL([have_ft2], [true]) -have_ft2_or_t1=yes - fi -AM_CONDITIONAL([have_t1], [test "x$ac_cv_func_T1_InitLib" = xyes]) -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]) +AM_CONDITIONAL([have_t1], [test "x$have_t1" = xyes]) +AM_CONDITIONAL([have_ft2], [test "x$have_ft2" = xyes]) +AM_CONDITIONAL([have_ft2_or_t1], [test "x$have_ft2:$have_t1" != xno:no]) AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes]) AC_MSG_RESULT([ |