summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdf-x/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-08-08 10:50:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-08-08 10:50:58 +0000
commitde9ca7eda14337c01d1f75c831fdd2e78ef97381 (patch)
treeef8e1fb83568345217b05a1c726f711316e9f57a /Build/source/texk/dvipdf-x/configure
parente565d5d60693a481de552c3345c1538252caf705 (diff)
dvipdfm-x: Bug fix - handle pdf:bann, pdf:eann, and pdf:ann specials
git-svn-id: svn://tug.org/texlive/trunk@31386 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdf-x/configure')
-rwxr-xr-xBuild/source/texk/dvipdf-x/configure169
1 files changed, 80 insertions, 89 deletions
diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure
index 167d4020465..c65b9e1b330 100755
--- a/Build/source/texk/dvipdf-x/configure
+++ b/Build/source/texk/dvipdf-x/configure
@@ -643,6 +643,8 @@ WIN32_CALL_FALSE
WIN32_CALL_TRUE
WIN32_FALSE
WIN32_TRUE
+PAPER_LIBS
+PAPER_INCLUDES
FREETYPE2_RULE
FREETYPE2_DEPEND
FREETYPE2_LIBS
@@ -805,7 +807,8 @@ with_zlib_includes
with_zlib_libdir
with_system_libpng
with_system_freetype2
-with_paper
+with_paper_includes
+with_paper_libdir
'
ac_precious_vars='build_alias
host_alias
@@ -1477,7 +1480,9 @@ Optional Packages:
pkg-config)
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
- --with-paper=DIR use paper include/library files from DIR
+ --with-paper-includes=DIR
+ paper headers installed in DIR
+ --with-paper-libdir=DIR paper library installed in DIR
Some influential environment variables:
CC C compiler command
@@ -15710,6 +15715,10 @@ ${top_builddir}/../../libs/freetype2/ft2build.h:
fi
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
+
+
if test "x$enable_build" != xno || test -f config.force; then
eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
@@ -15727,130 +15736,97 @@ fi
eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$ZLIB_LIBS \$LIBS\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib header files and library" >&5
-$as_echo_n "checking for zlib header files and library... " >&6; }
-if ${cho_cv_have_zlib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <zlib.h>
int
main ()
{
-z_stream p;
+Bytef *dst,*src; uLong dstlen, srclen; int lvl, err;
+ err=compress2(dst, &dstlen, src, srclen, lvl);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- cho_cv_have_zlib=yes
+
else
- cho_cv_have_zlib=no
+ as_fn_error $? "Sorry, you need zlib with compress2" "$LINENO" 5
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cho_cv_have_zlib" >&5
-$as_echo "$cho_cv_have_zlib" >&6; }
-if test "x$cho_cv_have_zlib" = xyes; then :
- for ac_func in compress
-do :
- ac_fn_c_check_func "$LINENO" "compress" "ac_cv_func_compress"
-if test "x$ac_cv_func_compress" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_COMPRESS 1
-_ACEOF
-
-$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
-
- for ac_func in compress2
-do :
- ac_fn_c_check_func "$LINENO" "compress2" "ac_cv_func_compress2"
-if test "x$ac_cv_func_compress2" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_COMPRESS2 1
-_ACEOF
-
-$as_echo "#define HAVE_ZLIB_COMPRESS2 1" >>confdefs.h
-
-fi
-done
-
-fi
-done
-
-fi
-
eval CPPFLAGS=\"$LIBPNG_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$LIBPNG_LIBS \$LIBS\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng header files and library" >&5
-$as_echo_n "checking for libpng header files and library... " >&6; }
-if ${cho_cv_have_png+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <png.h>
int
main ()
{
-png_infop p;
+png_const_structp png; png_const_infop info; int err;
+ err=png_get_image_width(png, info);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- cho_cv_have_png=yes
+
else
- cho_cv_have_png=no
+ as_fn_error $? "Sorry, you need libpng" "$LINENO" 5
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cho_cv_have_png" >&5
-$as_echo "$cho_cv_have_png" >&6; }
-if test "x$cho_cv_have_png" = xyes; then :
- for ac_func in png_get_image_width
-do :
- ac_fn_c_check_func "$LINENO" "png_get_image_width" "ac_cv_func_png_get_image_width"
-if test "x$ac_cv_func_png_get_image_width" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PNG_GET_IMAGE_WIDTH 1
-_ACEOF
-$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
-fi
-done
+echo timestamp >config.force
fi
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
+$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
-echo timestamp >config.force
-fi
+$as_echo "#define HAVE_ZLIB_COMPRESS2 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+
if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
-# Check whether --with-paper was given.
-if test "${with_paper+set}" = set; then :
- withval=$with_paper; if test -d "$withval"; then
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- fi
+
+# Check whether --with-paper-includes was given.
+if test "${with_paper_includes+set}" = set; then :
+ withval=$with_paper_includes;
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5
+# Check whether --with-paper-libdir was given.
+if test "${with_paper_libdir+set}" = set; then :
+ withval=$with_paper_libdir;
+fi
+case $with_paper_includes in #(
+ "" | yes) :
+ PAPER_INCLUDES= ;; #(
+ *) :
+ PAPER_INCLUDES="-I$with_paper_includes" ;;
+esac
+case $with_paper_libdir in #(
+ "" | yes) :
+ PAPER_LIBS= ;; #(
+ *) :
+ PAPER_LIBS="-L$with_paper_libdir" ;;
+esac
+CPPFLAGS="$CPPFLAGS $PAPER_INCLUDES"
+LIBS="$LIBS $PAPER_LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5
$as_echo_n "checking for paper header files... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+result=no
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <paper.h>
int
@@ -15862,9 +15838,7 @@ struct paper *p;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5
$as_echo_n "checking for library containing paperpswidth... " >&6; }
if ${ac_cv_search_paperpswidth+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15918,17 +15892,34 @@ ac_res=$ac_cv_search_paperpswidth
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
-
fi
-else
- CPPFLAGS=$_cppflags
- LDDFLAGS=$_ldflags
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ case $ac_cv_search_paperpswidth in #(
+ no) :
+ : ;; #(
+ "none required") :
+ result=yes ;; #(
+ *) :
+ result=yes
+ PAPER_LIBS="$PAPER_LIBS $ac_cv_search_paperpswidth" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+case $result in #(
+ no) :
+ PAPER_INCLUDES= PAPER_LIBS= ;; #(
+ *) :
+
+$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
+ ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
fi