summaryrefslogtreecommitdiff
path: root/Build/source/texk
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/texk
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/texk')
-rwxr-xr-xBuild/source/texk/configure1
-rw-r--r--Build/source/texk/dvipng/ChangeLog4
-rw-r--r--Build/source/texk/dvipng/Makefile.am11
-rw-r--r--Build/source/texk/dvipng/Makefile.in7
-rw-r--r--Build/source/texk/dvipng/ac/withenable.ac4
-rwxr-xr-xBuild/source/texk/dvipng/configure4
-rwxr-xr-xBuild/source/texk/dvisvgm/configure4
-rwxr-xr-xBuild/source/texk/ttf2pk2/configure4
-rwxr-xr-xBuild/source/texk/web2c/configure8
-rwxr-xr-xBuild/source/texk/xdvipdfmx/configure4
10 files changed, 16 insertions, 35 deletions
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index a59659437f8..04109ee88cc 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -4075,7 +4075,6 @@ esac
test "x$enable_dvipng" = xno || {
need_kpathsea=yes
- need_freetype2=yes
need_gd=yes
need_t1lib=yes
}
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 5afb2a3c1fd..5797412bf00 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (dvipng_dependencies): Drop indirect dependencies.
+
2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Drop check for 64-bit integer types, already
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index bdbff49a2f5..3b6e5c8dd67 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dvipng/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
#************************************************************************
@@ -75,8 +75,7 @@ nodist_dvipng_SOURCES += \
$(DVIPNG_TREE)/tfm.c
endif have_ft2_or_t1
-dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
-dvipng_dependencies += $(T1LIB_DEPEND) $(FREETYPE2_DEPEND) $(GD_DEPEND)
+dvipng_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) $(GD_DEPEND)
$(dvipng_OBJECTS): config.force
@@ -98,16 +97,10 @@ dvigif_LDADD =
## Rebuild libkpathsea
@KPATHSEA_RULE@
-## Rebuild libfreetype
-@FREETYPE2_RULE@
## Rebuild libgd
@GD_RULE@
## Rebuild libt1
@T1LIB_RULE@
-## Rebuild libpng
-@LIBPNG_RULE@
-## Rebuild libz
-@ZLIB_RULE@
include $(srcdir)/../am/bin_links.am
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 8f0762fe0ac..0dc599e543b 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -377,9 +377,7 @@ nodist_dvipng_SOURCES = $(DVIPNG_TREE)/color.c $(DVIPNG_TREE)/draw.c \
$(DVIPNG_TREE)/ppagelist.c $(DVIPNG_TREE)/set.c \
$(DVIPNG_TREE)/special.c $(DVIPNG_TREE)/vf.c $(am__append_1) \
$(am__append_2) $(am__append_3)
-dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \
- $(LIBPNG_DEPEND) $(T1LIB_DEPEND) $(FREETYPE2_DEPEND) \
- $(GD_DEPEND)
+dvipng_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) $(GD_DEPEND)
DISTCLEANFILES = config.force
LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \
$(LIBPNG_LIBS) $(ZLIB_LIBS)
@@ -1389,11 +1387,8 @@ config.force: $(dvipng_dependencies)
$(SHELL) ./config.status Makefile config.h
@KPATHSEA_RULE@
-@FREETYPE2_RULE@
@GD_RULE@
@T1LIB_RULE@
-@LIBPNG_RULE@
-@ZLIB_RULE@
.PHONY: install-bin-links uninstall-bin-links
install-bin-links:
diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac
index 0ccd52f780e..07865f537fb 100644
--- a/Build/source/texk/dvipng/ac/withenable.ac
+++ b/Build/source/texk/dvipng/ac/withenable.ac
@@ -1,8 +1,8 @@
## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for dvipng
-KPSE_ENABLE_PROG([dvipng], [kpathsea freetype2 gd t1lib])
+KPSE_ENABLE_PROG([dvipng], [kpathsea gd t1lib])
m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac])
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 9773095216b..32ec48f1a8b 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -16204,10 +16204,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
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 20e68f890a3..68ef082e93d 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -18931,10 +18931,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
diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure
index 22d9efbba0f..83be7dca592 100755
--- a/Build/source/texk/ttf2pk2/configure
+++ b/Build/source/texk/ttf2pk2/configure
@@ -14440,10 +14440,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
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 3a1ca87248c..c3856551c70 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -22688,11 +22688,11 @@ if test "${with_system_poppler+set}" = set; then :
withval=$with_system_poppler;
fi
if test "x$with_system_poppler" = xyes; then
- if $PKG_CONFIG poppler --atleast-version=0.18; then
+ if $PKG_CONFIG poppler --atleast-version=0.20; then
POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
- as_fn_error $? "did not find poppler-0.18 or better" "$LINENO" 5
+ as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5
fi
else
POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler -I$kpse_BLD/libs/poppler/goo -I$kpse_BLD/libs/poppler/poppler"
@@ -22860,10 +22860,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
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index cd6123f032a..7ce8b83ca7a 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -15513,10 +15513,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