poppler 0.18.0

git-svn-id: svn://tug.org/texlive/trunk@24242 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 16 insertions, 21 deletions

diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index f5e960eb599..b568df6980b 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -13413,7 +13413,6 @@ kpse_save_LIBS=$LIBS
 eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$ZLIB_LIBS \$LIBS\"
 
-
 ac_fn_c_check_func "$LINENO" "deflate" "ac_cv_func_deflate"
 if test "x$ac_cv_func_deflate" = xyes; then :
 
@@ -13436,13 +13435,9 @@ fi
 done
 
 
-$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
-
-
 eval CPPFLAGS=\"$LIBPNG_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$LIBPNG_LIBS \$LIBS\"
 
-
 ac_fn_c_check_func "$LINENO" "png_create_read_struct" "ac_cv_func_png_create_read_struct"
 if test "x$ac_cv_func_png_create_read_struct" = xyes; then :
 
@@ -13465,13 +13460,9 @@ fi
 done
 
 
-$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-
 eval CPPFLAGS=\"$FREETYPE2_INCLUDES \$CPPFLAGS\"
 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" = xyes; then :
 
@@ -13494,9 +13485,6 @@ fi
 done
 
 
-$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
-
-
 CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
@@ -13504,6 +13492,16 @@ LIBS=$kpse_save_LIBS
 echo timestamp >config.force
 fi
 
+
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+
+
 GD_TREE=gd-2.0.35
 
 
diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac
index fb51f497881..6d6226f4484 100644
--- a/Build/source/libs/gd/configure.ac
+++ b/Build/source/libs/gd/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -46,30 +46,27 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
 if test "x$enable_build" != xno || test -f config.force; then
 
 KPSE_ADD_FLAGS([zlib])
-
 AC_CHECK_FUNC([deflate], , [AC_ERROR([zlib not found])])
 AC_CHECK_HEADERS([zlib.h], , [AC_ERROR([zlib not found])])
-AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
 
 KPSE_ADD_FLAGS([libpng])
-
 AC_CHECK_FUNC([png_create_read_struct], , [AC_ERROR([libpng not found])])
 AC_CHECK_HEADERS([png.h], , [AC_ERROR([libpng not found])])
-AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.])
 
 KPSE_ADD_FLAGS([freetype2])
-
 AC_CHECK_FUNC([FT_Init_FreeType], , [AC_ERROR([libfreetype2 not found])])
 AC_CHECK_HEADERS([ft2build.h], , [AC_ERROR([libfreetype2 not found])])
-AC_DEFINE([HAVE_LIBFREETYPE], 1, [ Define if you have the freetype library.])
 
 KPSE_RESTORE_FLAGS
 
 echo timestamp >config.force
 fi
 
-GD_TREE=gd-[]gd_version
-AC_SUBST([GD_TREE])
+AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
+AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.])
+AC_DEFINE([HAVE_LIBFREETYPE], 1, [ Define if you have the freetype library.])
+
+AC_SUBST([GD_TREE], [gd-]gd_version)
 
 AC_CONFIG_FILES([Makefile include/Makefile])