summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvipng/configure.ac')
-rw-r--r--Build/source/texk/dvipng/configure.ac20
1 files changed, 4 insertions, 16 deletions
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 2c2850df3d0..a4d76c93208 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -13,7 +13,7 @@ dnl Copyright (C) 2002-2008 Jan-Åke Larsson
dnl
dnl *********************************************************************
dnl
-m4_define([dvipng_version], [1.14])[]dnl using unmodified dvipng source tree
+m4_include([version.ac])[] dnl define dvipng_version
AC_INIT([dvipng], dvipng_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([dvipng-]dvipng_version[/dvipng.c])
@@ -69,7 +69,7 @@ AC_TYPE_PID_T
# Checks for library functions.
AC_FUNC_ALLOCA
AC_FUNC_FORK
-AC_FUNC_MALLOC
+dnl AC_FUNC_MALLOC
AC_FUNC_MMAP
AC_FUNC_STRTOD
AC_FUNC_VPRINTF
@@ -93,12 +93,10 @@ AC_PATH_PROG([INSTALL_INFO], [install-info], [:], [$PATH /usr/sbin /sbin])
KPSE_KPATHSEA_FLAGS
KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
-KPSE_T1LIB_FLAGS
KPSE_FREETYPE2_FLAGS
KPSE_GD_FLAGS
-# Assume we have t1lib and freetype2.
-have_t1=yes
+# Assume we have freetype2.
have_ft2=yes
if test "x$enable_build" != xno || test -f config.force; then
@@ -115,12 +113,6 @@ AC_CHECK_FUNC([png_read_image],
[Define to 1 if you have the `png' library (-lpng).])],
[AC_MSG_ERROR([cannot find/use libpng])])
-KPSE_ADD_FLAGS([t1lib])
-AC_CHECK_FUNC([T1_InitLib],
- [AC_DEFINE([HAVE_LIBT1], 1,
- [Define to 1 if you have the `t1' library (-lt1).])],
- [have_t1=no])
-
KPSE_ADD_FLAGS([freetype2])
AC_CHECK_FUNC([FT_Init_FreeType],
[AC_DEFINE([HAVE_FT2], 1,
@@ -131,7 +123,7 @@ KPSE_ADD_FLAGS([gd])
AC_CHECK_FUNC([gdImageCreate],
[AC_DEFINE([HAVE_LIBGD], 1,
[Define to 1 if you have the `gd' library (-lgd).])],
- [AC_MSG_ERROR([cannot find/use libgd
+ [AC_MSG_ERROR([cannot find/use gd
This drawing library can be downloaded at http://www.boutell.com/gd])])
KPSE_ADD_FLAGS([kpathsea])
@@ -149,7 +141,6 @@ KPSE_CHECK_KPSE_FORMAT([opentype],
# Checks for more header files.
AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h], ,
[AC_MSG_ERROR([cannot find/use $ac_header])])
-AC_CHECK_HEADERS([t1lib.h])
# Checks for more library functions.
AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif FT_Library_Version])
@@ -160,9 +151,7 @@ echo timestamp >config.force
fi
-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([
@@ -185,7 +174,6 @@ AC_MSG_RESULT([
(dvigif): $ac_cv_func_gdImageGif
FreeType font rendering available: $ac_cv_func_FT_Init_FreeType
Support for subfonts (CJK-LaTeX): $ac_cv_func_FT_Init_FreeType
- T1lib font rendering available: $ac_cv_func_T1_InitLib
])
AC_CONFIG_HEADERS([config.h])