diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-01-19 16:04:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-01-19 16:04:18 +0000 |
commit | 99566ea0f91169641232fc4cc334f64ee0a0ec3b (patch) | |
tree | 83325cda83e8d4cb8c2ba6332e6d5927979f7c35 /Build/source/texk/dvipng/configure | |
parent | 2e6f02230d397b4ecc76c33f6871d2ffa42a38ae (diff) |
build system: correction of dependencies
git-svn-id: svn://tug.org/texlive/trunk@16786 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng/configure')
-rwxr-xr-x | Build/source/texk/dvipng/configure | 79 |
1 files changed, 53 insertions, 26 deletions
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 15e863e15ea..c7d87bd9176 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -15034,9 +15034,32 @@ else fi +eval CPPFLAGS=\"$T1LIB_INCLUDES \$CPPFLAGS\" +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 +fi + + eval CPPFLAGS=\"$FREETYPE2_INCLUDES \$CPPFLAGS\" 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 + +fi + + eval CPPFLAGS=\"$GD_INCLUDES \$CPPFLAGS\" eval LIBS=\"$GD_LIBS \$LIBS\" @@ -15099,32 +15122,6 @@ $as_echo "#define HAVE_KPSE_ENC_FORMATS 1" >>confdefs.h fi -eval CPPFLAGS=\"$T1LIB_INCLUDES \$CPPFLAGS\" -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 -fi - - -eval CPPFLAGS=\"$FREETYPE2_INCLUDES \$CPPFLAGS\" -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 - -fi - - # Checks for more header files. for ac_header in gd.h png.h kpathsea/kpathsea.h do : @@ -15175,6 +15172,28 @@ 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 @@ -15389,6 +15408,14 @@ 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 |