summaryrefslogtreecommitdiff
path: root/Build/source/libs/gd
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-26 08:10:55 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-26 08:10:55 +0000
commit3c06d717b891d74b66f02b12ba0d4ad0f6437f5c (patch)
tree51bd46e7acd2ce72f2be14de4c9bfe854a47341c /Build/source/libs/gd
parent6650155057159411fc2dddd0ae020266eb3509b5 (diff)
poppler: Require 0.20 or better for POPPLER_VERSION
build system: Better dependencies for parallel builds git-svn-id: svn://tug.org/texlive/trunk@28367 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/gd')
-rw-r--r--Build/source/libs/gd/ChangeLog6
-rw-r--r--Build/source/libs/gd/Makefile.am9
-rw-r--r--Build/source/libs/gd/Makefile.in13
-rwxr-xr-xBuild/source/libs/gd/configure10
-rw-r--r--Build/source/libs/gd/configure.ac3
5 files changed, 24 insertions, 17 deletions
diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog
index 192f7533b02..137444028e8 100644
--- a/Build/source/libs/gd/ChangeLog
+++ b/Build/source/libs/gd/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Better dependencies for parallel build.
+ * configure.ac: Make sure 'config.status --recheck' leaves the
+ generated config.h unchanged.
+
2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index 2cfc5e4bc81..7467539c065 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -14,9 +14,6 @@ rebuild: all
## We want to re-distribute the whole original libpng source tree.
##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(GD_TREE).
EXTRA_DIST = $(GD_TREE)
## Changes applied to the original source tree
@@ -46,7 +43,7 @@ AM_CPPFLAGS += -DNONDLL
noinst_LIBRARIES=libgd.a
-nodist_libgd_a_SOURCES = \
+libgd_a_SOURCES = \
$(GD_TREE)/gd.c \
$(GD_TREE)/gd_gd.c \
$(GD_TREE)/gd_gd2.c \
@@ -78,14 +75,12 @@ nodist_libgd_a_SOURCES = \
$(libgd_a_OBJECTS): config.force
-config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
+config.force: $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
DISTCLEANFILES = config.force
-## Rebuild zlib
-@ZLIB_RULE@
## Rebuild libpng
@LIBPNG_RULE@
## Rebuild libfreetype
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index ae45659ab36..250924fc847 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -86,7 +86,7 @@ LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
libgd_a_AR = $(AR) $(ARFLAGS)
libgd_a_LIBADD =
-nodist_libgd_a_OBJECTS = gd.$(OBJEXT) gd_gd.$(OBJEXT) gd_gd2.$(OBJEXT) \
+am_libgd_a_OBJECTS = gd.$(OBJEXT) gd_gd.$(OBJEXT) gd_gd2.$(OBJEXT) \
gd_gif_in.$(OBJEXT) gd_gif_out.$(OBJEXT) gd_io.$(OBJEXT) \
gd_io_dp.$(OBJEXT) gd_io_file.$(OBJEXT) gd_io_ss.$(OBJEXT) \
gd_jpeg.$(OBJEXT) gd_png.$(OBJEXT) gd_security.$(OBJEXT) \
@@ -96,7 +96,7 @@ nodist_libgd_a_OBJECTS = gd.$(OBJEXT) gd_gd.$(OBJEXT) gd_gd2.$(OBJEXT) \
gdft.$(OBJEXT) gdfx.$(OBJEXT) gdhelpers.$(OBJEXT) \
gdkanji.$(OBJEXT) gdtables.$(OBJEXT) gdxpm.$(OBJEXT) \
wbmp.$(OBJEXT)
-libgd_a_OBJECTS = $(nodist_libgd_a_OBJECTS)
+libgd_a_OBJECTS = $(am_libgd_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -110,8 +110,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(nodist_libgd_a_SOURCES)
-DIST_SOURCES =
+SOURCES = $(libgd_a_SOURCES)
+DIST_SOURCES = $(libgd_a_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -307,7 +307,7 @@ SUBDIRS = include
AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) \
$(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) -DNONDLL
noinst_LIBRARIES = libgd.a
-nodist_libgd_a_SOURCES = \
+libgd_a_SOURCES = \
$(GD_TREE)/gd.c \
$(GD_TREE)/gd_gd.c \
$(GD_TREE)/gd_gd2.c \
@@ -1333,11 +1333,10 @@ dist-hook:
$(libgd_a_OBJECTS): config.force
-config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
+config.force: $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
-@ZLIB_RULE@
@LIBPNG_RULE@
@FREETYPE2_RULE@
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index b09e4048b0d..242b7639f9f 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -13449,10 +13449,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
fi
else
- FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2"
+ FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`"
- FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`"
FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
@@ -13561,12 +13559,18 @@ fi
$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h
+
$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+$as_echo "#define HAVE_PNG_H 1" >>confdefs.h
+
$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_FT2BUILD_H 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 6d6226f4484..49da40fa3f1 100644
--- a/Build/source/libs/gd/configure.ac
+++ b/Build/source/libs/gd/configure.ac
@@ -63,8 +63,11 @@ echo timestamp >config.force
fi
AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
+AC_DEFINE([HAVE_ZLIB_H], 1)
AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.])
+AC_DEFINE([HAVE_PNG_H], 1)
AC_DEFINE([HAVE_LIBFREETYPE], 1, [ Define if you have the freetype library.])
+AC_DEFINE([HAVE_FT2BUILD_H], 1)
AC_SUBST([GD_TREE], [gd-]gd_version)