summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-04-02 15:58:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2008-04-02 15:58:38 +0000
commit68de4bd53edb6bb668112064bcd67faa565a2e0a (patch)
treed0a3d41fdaa1283e4ebf32f10bf69059b627cfc6 /Build
parentc8a8f5c5df97a7bfbf58693b9ac635903be7d55f (diff)
dvipng with system libraries
git-svn-id: svn://tug.org/texlive/trunk@7287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipng/ChangeLog4
-rw-r--r--Build/source/texk/dvipng/config.h.in67
-rwxr-xr-xBuild/source/texk/dvipng/configure814
-rw-r--r--Build/source/texk/dvipng/configure.ac50
4 files changed, 590 insertions, 345 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index bd7229e7270..6bf2666796c 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: fix (system and included) library dependencies.
+
2008-03-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* special.c: allow for libgd without jpeg support.
diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in
index b3dde183d3a..45b7501b671 100644
--- a/Build/source/texk/dvipng/config.h.in
+++ b/Build/source/texk/dvipng/config.h.in
@@ -11,15 +11,6 @@
/* Define as 1 to get the debug (-d) option. */
#undef DEBUG
-/* The environment setting for $SELFAUTODIR */
-#undef ENV_SELFAUTODIR
-
-/* The environment setting for $SELFAUTOLOC */
-#undef ENV_SELFAUTOLOC
-
-/* The environment setting for $SELFAUTOPARENT */
-#undef ENV_SELFAUTOPARENT
-
/* Define as the path to GhostScript. */
#undef GS_PATH
@@ -30,6 +21,9 @@
*/
#undef HAVE_ALLOCA_H
+/* Define if you have ApplicationServices (Mac OS X) */
+#undef HAVE_APP_SERVICES
+
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
@@ -39,12 +33,12 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
/* Define to 1 if you have freetype2 */
#undef HAVE_FT2
+/* Define to 1 if you have the <ft2build.h> header file. */
+#undef HAVE_FT2BUILD_H
+
/* Define to 1 if you have the `ftime' function. */
#undef HAVE_FTIME
@@ -78,21 +72,18 @@
/* Define to 1 if you have the <kpathsea/kpathsea.h> header file. */
#undef HAVE_KPATHSEA_KPATHSEA_H
-/* Define to 1 if your kpathsea has kpse_enc_format */
+/* Define to 1 if your kpathsea has kpse_enc_format. */
#undef HAVE_KPSE_ENC_FORMATS
+/* Define to 1 if you have the `freetype' library (-lfreetype). */
+#undef HAVE_LIBFREETYPE
+
/* Define to 1 if you have the `gd' library (-lgd). */
#undef HAVE_LIBGD
-/* Define to 1 if you have the `gen' library (-lgen). */
-#undef HAVE_LIBGEN
-
/* Define to 1 if you have the `kpathsea' library (-lkpathsea). */
#undef HAVE_LIBKPATHSEA
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
/* Define to 1 if you have the `png' library (-lpng). */
#undef HAVE_LIBPNG
@@ -102,10 +93,6 @@
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#undef HAVE_MALLOC
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -127,7 +114,7 @@
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
-/* Define to 1 if stdbool.h conforms to C99. */
+/* Define to 1 if you have the <stdbool.h> header file. */
#undef HAVE_STDBOOL_H
/* Define to 1 if you have the <stdint.h> header file. */
@@ -172,23 +159,11 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if you have the `vfork' function. */
-#undef HAVE_VFORK
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
-/* Define to 1 if `fork' works. */
-#undef HAVE_WORKING_FORK
-
-/* Define to 1 if `vfork' works. */
-#undef HAVE_WORKING_VFORK
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -207,7 +182,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
@@ -225,20 +200,8 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define to `long long' if <inttypes.h> does not define it. */
-#undef int64_t
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
-
-/* Define to `unsigned long long' if <inttypes.h> does not define it. */
-#undef uint64_t
-
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 10e55acce2d..6564a837cdc 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -653,6 +653,11 @@ build_alias
host_alias
target_alias
SET_MAKE
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+GS
+PSFONTS_O
CC
CFLAGS
LDFLAGS
@@ -660,11 +665,6 @@ CPPFLAGS
ac_ct_CC
EXEEXT
OBJEXT
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-GS
-PSFONTS_O
CPP
GREP
EGREP
@@ -1822,6 +1822,305 @@ echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+done
+IFS=$as_save_IFS
+
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Check whether --with-gs was given.
+if test "${with_gs+set}" = set; then
+ withval=$with_gs; if test "x$withval" = xno ; then
+ GS=no
+ else
+ # Extract the first word of ""$withval"", so it can be a program name with args.
+set dummy "$withval"; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $GS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GS="$GS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GS="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GS=$ac_cv_path_GS
+if test -n "$GS"; then
+ { echo "$as_me:$LINENO: result: $GS" >&5
+echo "${ECHO_T}$GS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+else
+ # Extract the first word of "gs", so it can be a program name with args.
+set dummy gs; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_GS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$GS"; then
+ ac_cv_prog_GS="$GS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_GS="gs"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+GS=$ac_cv_prog_GS
+if test -n "$GS"; then
+ { echo "$as_me:$LINENO: result: $GS" >&5
+echo "${ECHO_T}$GS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ if test -z "$GS"; then
+ GS="gs"
+ { echo "$as_me:$LINENO: WARNING: Cannot find GhostScript in your PATH" >&5
+echo "$as_me: WARNING: Cannot find GhostScript in your PATH" >&2;}
+ fi
+
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define GS_PATH "$GS"
+_ACEOF
+
+
+
+
+
+GS_WARN=""
+{ echo "$as_me:$LINENO: checking whether $GS has the pngalpha device" >&5
+echo $ECHO_N "checking whether $GS has the pngalpha device... $ECHO_C" >&6; }
+ if $GS -h | grep pngalpha >/dev/null; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ GS_WARN="Your EPS inclusions will be cropped to the
+ boundingbox, and rendered on an opaque background.
+ Upgrade GhostScript to avoid this."
+ { echo "$as_me:$LINENO: checking whether $GS has the png16m device" >&5
+echo $ECHO_N "checking whether $GS has the png16m device... $ECHO_C" >&6; }
+ if $GS -h | grep png16m >/dev/null; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ GS_WARN="Your EPS inclusions may not work.
+ Upgrade/install GhostScript to avoid this."
+ fi
+
+ fi
+
+if test -n "$GS_WARN"; then
+ { echo "$as_me:$LINENO: WARNING: $GS_WARN" >&5
+echo "$as_me: WARNING: $GS_WARN" >&2;}
+fi
+
+ac_cv_lib_t1_T1_InitLib=yes
+PSFONTS_O=""
+if test "$ac_cv_lib_t1_T1_InitLib" = yes; then
+ PSFONTS_O="t1.o"
+fi
+
+
+ac_have_freetype2="yes" # we have ft2
+if test "$ac_have_freetype2" = yes; then
+ # Have to set compiler and linker flags in Makefile.in, it seems.
+ PSFONTS_O="$PSFONTS_O sfd.o ft.o"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FT2 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_FT_LIBRARY_VERSION 1
+_ACEOF
+
+fi
+
+if test -n "$PSFONTS_O"; then
+ PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o"
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2741,275 +3040,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
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Check whether --with-gs was given.
-if test "${with_gs+set}" = set; then
- withval=$with_gs; if test "x$withval" = xno ; then
- GS=no
- else
- # Extract the first word of ""$withval"", so it can be a program name with args.
-set dummy "$withval"; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $GS in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GS="$GS" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GS="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GS=$ac_cv_path_GS
-if test -n "$GS"; then
- { echo "$as_me:$LINENO: result: $GS" >&5
-echo "${ECHO_T}$GS" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- fi
-else
- # Extract the first word of "gs", so it can be a program name with args.
-set dummy gs; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_GS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$GS"; then
- ac_cv_prog_GS="$GS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_GS="gs"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-GS=$ac_cv_prog_GS
-if test -n "$GS"; then
- { echo "$as_me:$LINENO: result: $GS" >&5
-echo "${ECHO_T}$GS" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- if test -z "$GS"; then
- GS="gs"
- { echo "$as_me:$LINENO: WARNING: Cannot find GhostScript in your PATH" >&5
-echo "$as_me: WARNING: Cannot find GhostScript in your PATH" >&2;}
- fi
-
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define GS_PATH "$GS"
-_ACEOF
-
-
-
-
-
-GS_WARN=""
-{ echo "$as_me:$LINENO: checking whether $GS has the pngalpha device" >&5
-echo $ECHO_N "checking whether $GS has the pngalpha device... $ECHO_C" >&6; }
- if $GS -h | grep pngalpha >/dev/null; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- GS_WARN="Your EPS inclusions will be cropped to the
- boundingbox, and rendered on an opaque background.
- Upgrade GhostScript to avoid this."
- { echo "$as_me:$LINENO: checking whether $GS has the png16m device" >&5
-echo $ECHO_N "checking whether $GS has the png16m device... $ECHO_C" >&6; }
- if $GS -h | grep png16m >/dev/null; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- GS_WARN="Your EPS inclusions may not work.
- Upgrade/install GhostScript to avoid this."
- fi
-
- fi
-
-if test -n "$GS_WARN"; then
- { echo "$as_me:$LINENO: WARNING: $GS_WARN" >&5
-echo "$as_me: WARNING: $GS_WARN" >&2;}
-fi
-
-ac_cv_lib_t1_T1_InitLib=yes
-PSFONTS_O=""
-if test "$ac_cv_lib_t1_T1_InitLib" = yes; then
- PSFONTS_O="t1.o"
-fi
-
-
-ac_have_freetype2="yes" # we have ft2
-if test "$ac_have_freetype2" = yes; then
- # Have to set compiler and linker flags in Makefile.in, it seems.
- PSFONTS_O="$PSFONTS_O sfd.o ft.o"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FT2 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_FT_LIBRARY_VERSION 1
-_ACEOF
-
-fi
-
-if test -n "$PSFONTS_O"; then
- PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o"
-fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -7170,10 +7200,227 @@ fi
-cat >>confdefs.h <<\_ACEOF
+if test "$with_system_freetype2" = yes; then
+ OLD_LIBS=$LIBS
+ LIBS="$LDFREETYPE2 $LIBS"
+
+for ac_func in FT_Library_Version
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ LIBS=$OLD_LIBS
+else
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_FT_LIBRARY_VERSION 1
+_ACEOF
+
+fi
+
+if test "$with_system_gd" = yes; then
+ OLD_LIBS=$LIBS
+ LIBS="$LDGD $LIBS"
+
+
+
+
+for ac_func in gdImageCreateTrueColor gdImagePngEx gdImageGif gdImageJpeg
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ LIBS=$OLD_LIBS
+else
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GDIMAGECREATETRUECOLOR 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_GDIMAGEPNGEX 1
_ACEOF
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GDIMAGEGIF 1
+_ACEOF
+
+fi
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_GD_H 1
_ACEOF
@@ -7183,19 +7430,23 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_T1LIB_H 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBT1 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_PNG_H 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBPNG 1
_ACEOF
@@ -7208,14 +7459,17 @@ _ACEOF
# Allow shared or static libkpathsea
LIBS="-L../kpathsea/.libs -lkpathsea $LIBS"
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPATHSEA_KPATHSEA_H 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPSE_ENC_FORMATS 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBKPATHSEA 1
_ACEOF
@@ -7952,6 +8206,11 @@ build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+GS!$GS$ac_delim
+PSFONTS_O!$PSFONTS_O$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -7959,11 +8218,6 @@ CPPFLAGS!$CPPFLAGS$ac_delim
ac_ct_CC!$ac_ct_CC$ac_delim
EXEEXT!$EXEEXT$ac_delim
OBJEXT!$OBJEXT$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-GS!$GS$ac_delim
-PSFONTS_O!$PSFONTS_O$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index c9439e40a23..1b3b49022ea 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -170,25 +170,49 @@ sinclude(../../libs/freetype2/withenable.ac)
sinclude(../../libs/freetype2/freetype2.ac)
sinclude(../kpathsea/withenable.ac)
-AC_DEFINE(HAVE_GDIMAGEGIF)
-AC_DEFINE(HAVE_GDIMAGECREATETRUECOLOR)
-AC_DEFINE(HAVE_GDIMAGEPNGEX)
-AC_DEFINE(HAVE_GD_H)
-AC_DEFINE(HAVE_LIBGD)
+if test "$with_system_freetype2" = yes; then
+ OLD_LIBS=$LIBS
+ LIBS="$LDFREETYPE2 $LIBS"
+ AC_CHECK_FUNCS([FT_Library_Version])
+ LIBS=$OLD_LIBS
+else
+ AC_DEFINE([HAVE_FT_LIBRARY_VERSION])
+fi
+
+if test "$with_system_gd" = yes; then
+ OLD_LIBS=$LIBS
+ LIBS="$LDGD $LIBS"
+ AC_CHECK_FUNCS([gdImageCreateTrueColor gdImagePngEx gdImageGif gdImageJpeg])
+ LIBS=$OLD_LIBS
+else
+ AC_DEFINE([HAVE_GDIMAGECREATETRUECOLOR])
+ AC_DEFINE([HAVE_GDIMAGEPNGEX])
+ AC_DEFINE([HAVE_GDIMAGEGIF])
+fi
+
+AC_DEFINE([HAVE_GD_H])
+AC_DEFINE([HAVE_LIBGD])
-AC_DEFINE(HAVE_T1LIB_H)
-AC_DEFINE(HAVE_LIBT1)
+AC_DEFINE([HAVE_T1LIB_H], 1,
+ [Define to 1 if you have the <t1lib.h> header file.])
+AC_DEFINE([HAVE_LIBT1], 1,
+ [Define to 1 if you have the `t1' library (-lt1).])
-AC_DEFINE(HAVE_PNG_H)
-AC_DEFINE(HAVE_LIBPNG)
+AC_DEFINE([HAVE_PNG_H], 1,
+ [Define to 1 if you have the <png.h> header file.])
+AC_DEFINE([HAVE_LIBPNG], 1,
+ [Define to 1 if you have the `png' library (-lpng).])
-AC_DEFINE(HAVE_LIBZ)
+AC_DEFINE([HAVE_LIBZ])
# Allow shared or static libkpathsea
LIBS="-L../kpathsea/.libs -lkpathsea $LIBS"
-AC_DEFINE(HAVE_KPATHSEA_KPATHSEA_H)
-AC_DEFINE(HAVE_KPSE_ENC_FORMATS)
-AC_DEFINE(HAVE_LIBKPATHSEA)
+AC_DEFINE([HAVE_KPATHSEA_KPATHSEA_H], 1,
+ [Define to 1 if you have the <kpathsea/kpathsea.h> header file.])
+AC_DEFINE([HAVE_KPSE_ENC_FORMATS], 1,
+ [Define to 1 if your kpathsea has kpse_enc_format.])
+AC_DEFINE([HAVE_LIBKPATHSEA], 1,
+ [Define to 1 if you have the `kpathsea' library (-lkpathsea).])
#
# Check for ApplicationServices framework (Mac OS X)