summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Schrod <jschrod@acm.org>2007-08-14 00:14:34 +0000
committerJoachim Schrod <jschrod@acm.org>2007-08-14 00:14:34 +0000
commit2240a47d04efcd55c15362d67bedd5840fce1835 (patch)
tree86d06d17d72e62a4b1a1e4b99c32ae5fbcbbea5d
parent69c7e62e73bba0db84d96184f1163c1f44b427ba (diff)
dvipdfm and dvipdfmx need pnglib and zlib, too.
git-svn-id: svn://tug.org/texlive/trunk@4729 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/ChangeLog4
-rwxr-xr-xBuild/source/configure116
-rw-r--r--Build/source/configure.in8
3 files changed, 70 insertions, 58 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 7b1ed3724c9..0745bfe4c63 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-14 Joachim Schrod <jschrod@acm.org>
+
+ * configure.in: dvipdfm and dvipdfmx need pnglib and zlib, too.
+
2007-07-16 Karl Berry <karl@tug.org>
* Makefile.in (lib): new target, depends on @LIBSDEP@.
diff --git a/Build/source/configure b/Build/source/configure
index d5bb3017dc6..3f0d87ed622 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -3427,22 +3427,26 @@ test "$with_dialog" != no && : ${needs_ncurses=yes}
: ${needs_ncurses=no}
export needs_ncurses
-# we need pnglib for dvipng, pdf[ex]tex, xetex, xdvipdfmx
+# we need pnglib for dvipng, pdf[ex]tex, xetex, dvipdfm, dvipdfmx, xdvipdfmx
test ! -d $srcdir/$LIBPNGDIR && : ${needs_pnglib=no}
test "$with_dvipng" != no && : ${needs_pnglib=yes}
test "$with_pdftex" != no && : ${needs_pnglib=yes}
test "$with_pdfetex" != no && : ${needs_pnglib=yes}
test "$with_xetex" != no && : ${needs_pnglib=yes}
+test "$with_dvipdfm" != no && : ${needs_pnglib=yes}
+test "$with_dvipdfmx" != no && : ${needs_pnglib=yes}
test "$with_xdvipdfmx" != no && : ${needs_pnglib=yes}
: ${needs_pnglib=no}
export needs_pnglib
-# we need zlib for dvipng, texinfo, pdf[ex]tex, xetex, xdvipdfmx
+# we need zlib for dvipng, texinfo, pdf[ex]tex, xetex, dvipdfm, dvipdfmx, xdvipdfmx
test ! -d $srcdir/$ZLIBDIR && : ${needs_zlib=no}
test "$with_dvipng" != no && : ${needs_zlib=yes}
test "$with_pdftex" != no && : ${needs_zlib=yes}
test "$with_pdfetex" != no && : ${needs_zlib=yes}
test "$with_xetex" != no && : ${needs_zlib=yes}
+test "$with_dvipdfm" != no && : ${needs_zlib=yes}
+test "$with_dvipdfmx" != no && : ${needs_zlib=yes}
test "$with_xdvipdfmx" != no && : ${needs_zlib=yes}
test "$with_texinfo" != no && : ${needs_zlib=yes}
: ${needs_zlib=no}
@@ -3522,7 +3526,7 @@ else
if test "$with_system_pnglib" = yes; then
echo $ac_n "checking for png_set_read_fn in -lpng""... $ac_c" 1>&6
-echo "configure:3526: checking for png_set_read_fn in -lpng" >&5
+echo "configure:3530: checking for png_set_read_fn in -lpng" >&5
ac_lib_var=`echo png'_'png_set_read_fn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3530,7 +3534,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3534 "configure"
+#line 3538 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3541,7 +3545,7 @@ int main() {
png_set_read_fn()
; return 0; }
EOF
-if { (eval echo configure:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3612,7 +3616,7 @@ else
if test "$with_system_zlib" = yes; then
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:3616: checking for inflate in -lz" >&5
+echo "configure:3620: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3620,7 +3624,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3628 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3631,7 +3635,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3667,17 +3671,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3671: checking for $ac_hdr" >&5
+echo "configure:3675: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3676 "configure"
+#line 3680 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3763,7 +3767,7 @@ else
CURSESCPPFLAGS=
if test "$try_ncurses" = yes; then
echo $ac_n "checking for wresize in -lncurses""... $ac_c" 1>&6
-echo "configure:3767: checking for wresize in -lncurses" >&5
+echo "configure:3771: checking for wresize in -lncurses" >&5
ac_lib_var=`echo ncurses'_'wresize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3771,7 +3775,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3779 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3782,7 +3786,7 @@ int main() {
wresize()
; return 0; }
EOF
-if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3813,17 +3817,17 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3817: checking for $ac_hdr" >&5
+echo "configure:3821: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3822 "configure"
+#line 3826 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3864,17 +3868,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3868: checking for $ac_hdr" >&5
+echo "configure:3872: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3873 "configure"
+#line 3877 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3922,17 +3926,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3926: checking for $ac_hdr" >&5
+echo "configure:3930: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3931 "configure"
+#line 3935 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4041,7 +4045,7 @@ else
if test "$with_system_t1lib" = yes; then
echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6
-echo "configure:4045: checking for T1_AddFont in -lt1" >&5
+echo "configure:4049: checking for T1_AddFont in -lt1" >&5
ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4049,7 +4053,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lt1 -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4053 "configure"
+#line 4057 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4060,7 +4064,7 @@ int main() {
T1_AddFont()
; return 0; }
EOF
-if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4087,13 +4091,13 @@ fi
LIBS="-lt1 -lm $LIBS"
if test "$with_system_t1lib" = yes; then
echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6
-echo "configure:4091: checking whether installed T1 lib is >= v 5.0.0 " >&5
+echo "configure:4095: checking whether installed T1 lib is >= v 5.0.0 " >&5
if test "$cross_compiling" = yes; then
ac_compile_t1lib=1
]
else
cat > conftest.$ac_ext <<EOF
-#line 4097 "configure"
+#line 4101 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -4125,7 +4129,7 @@ int main() {
}
EOF
-if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_compile_t1lib=0
else
@@ -4193,7 +4197,7 @@ else
if test "$with_system_gd" = yes; then
echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
-echo "configure:4197: checking for gdImageCreateFromPng in -lgd" >&5
+echo "configure:4201: checking for gdImageCreateFromPng in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4201,7 +4205,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4205 "configure"
+#line 4209 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4212,7 +4216,7 @@ int main() {
gdImageCreateFromPng()
; return 0; }
EOF
-if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4245,7 +4249,7 @@ fi
if test "$with_system_gd" = yes; then
echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
-echo "configure:4249: checking for gdImageGif in -lgd" >&5
+echo "configure:4253: checking for gdImageGif in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4253,7 +4257,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4257 "configure"
+#line 4261 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4264,7 +4268,7 @@ int main() {
gdImageGif()
; return 0; }
EOF
-if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4300,17 +4304,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4304: checking for $ac_hdr" >&5
+echo "configure:4308: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4309 "configure"
+#line 4313 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4389,7 +4393,7 @@ else
if test "$with_system_freetype" = yes; then
echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
-echo "configure:4393: checking for TT_Init_FreeType in -lttf" >&5
+echo "configure:4397: checking for TT_Init_FreeType in -lttf" >&5
ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4397,7 +4401,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lttf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4401 "configure"
+#line 4405 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4408,7 +4412,7 @@ int main() {
TT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4444,17 +4448,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4448: checking for $ac_hdr" >&5
+echo "configure:4452: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4453 "configure"
+#line 4457 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4533,7 +4537,7 @@ else
if test "$with_system_freetype2" = yes; then
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:4537: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:4541: checking for FT_Init_FreeType in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4541,7 +4545,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4545 "configure"
+#line 4549 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4552,7 +4556,7 @@ int main() {
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4588,17 +4592,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4592: checking for $ac_hdr" >&5
+echo "configure:4596: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4597 "configure"
+#line 4601 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4677,7 +4681,7 @@ else
if test "$with_system_icu" = yes; then
echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6
-echo "configure:4681: checking for ubidi_open in -licuuc" >&5
+echo "configure:4685: checking for ubidi_open in -licuuc" >&5
ac_lib_var=`echo icuuc'_'ubidi_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4685,7 +4689,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-licuuc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4689 "configure"
+#line 4693 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4696,7 +4700,7 @@ int main() {
ubidi_open()
; return 0; }
EOF
-if { (eval echo configure:4700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4732,17 +4736,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4736: checking for $ac_hdr" >&5
+echo "configure:4740: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4741 "configure"
+#line 4745 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
diff --git a/Build/source/configure.in b/Build/source/configure.in
index cbe05f654b5..d5e3df118c9 100644
--- a/Build/source/configure.in
+++ b/Build/source/configure.in
@@ -134,22 +134,26 @@ test "$with_dialog" != no && : ${needs_ncurses=yes}
: ${needs_ncurses=no}
export needs_ncurses
-# we need pnglib for dvipng, pdf[ex]tex, xetex, xdvipdfmx
+# we need pnglib for dvipng, pdf[ex]tex, xetex, dvipdfm, dvipdfmx, xdvipdfmx
test ! -d $srcdir/$LIBPNGDIR && : ${needs_pnglib=no}
test "$with_dvipng" != no && : ${needs_pnglib=yes}
test "$with_pdftex" != no && : ${needs_pnglib=yes}
test "$with_pdfetex" != no && : ${needs_pnglib=yes}
test "$with_xetex" != no && : ${needs_pnglib=yes}
+test "$with_dvipdfm" != no && : ${needs_pnglib=yes}
+test "$with_dvipdfmx" != no && : ${needs_pnglib=yes}
test "$with_xdvipdfmx" != no && : ${needs_pnglib=yes}
: ${needs_pnglib=no}
export needs_pnglib
-# we need zlib for dvipng, texinfo, pdf[ex]tex, xetex, xdvipdfmx
+# we need zlib for dvipng, texinfo, pdf[ex]tex, xetex, dvipdfm, dvipdfmx, xdvipdfmx
test ! -d $srcdir/$ZLIBDIR && : ${needs_zlib=no}
test "$with_dvipng" != no && : ${needs_zlib=yes}
test "$with_pdftex" != no && : ${needs_zlib=yes}
test "$with_pdfetex" != no && : ${needs_zlib=yes}
test "$with_xetex" != no && : ${needs_zlib=yes}
+test "$with_dvipdfm" != no && : ${needs_zlib=yes}
+test "$with_dvipdfmx" != no && : ${needs_zlib=yes}
test "$with_xdvipdfmx" != no && : ${needs_zlib=yes}
test "$with_texinfo" != no && : ${needs_zlib=yes}
: ${needs_zlib=no}