summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng/configure
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvipng/configure')
-rwxr-xr-xBuild/source/texk/dvipng/configure47
1 files changed, 11 insertions, 36 deletions
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