summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-25 10:27:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-25 10:27:56 +0000
commit14fdf58582eb34614c899048041260830bf11319 (patch)
tree24c257e172a5759d4653886820e0debc19a79e75 /Build/source/libs
parent1d49a87a191295313dd1fdbce07dfb18ddd65bfc (diff)
new build system: update
git-svn-id: svn://tug.org/texlive/trunk@12515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/Makefile.in2
-rwxr-xr-xBuild/source/libs/configure46
-rw-r--r--Build/source/libs/gd/Makefile.in2
-rwxr-xr-xBuild/source/libs/gd/configure57
-rw-r--r--Build/source/libs/gd/configure.ac15
-rw-r--r--Build/source/libs/graphite/Makefile.am2
-rw-r--r--Build/source/libs/graphite/Makefile.in2
-rwxr-xr-xBuild/source/libs/libpng/configure10
-rw-r--r--Build/source/libs/libpng/configure.ac9
-rwxr-xr-xBuild/source/libs/teckit/configure10
-rw-r--r--Build/source/libs/teckit/configure.ac9
11 files changed, 125 insertions, 39 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 745566d644b..7bff066a725 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -67,6 +67,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \
$(top_srcdir)/../texk/dviljk/ac/withenable.ac \
$(top_srcdir)/../texk/dvipdfm/ac/withenable.ac \
$(top_srcdir)/../texk/dvipdfmx/ac/withenable.ac \
+ $(top_srcdir)/../texk/dvipng/ac/withenable.ac \
$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
@@ -81,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \
$(top_srcdir)/../texk/ttf2pk/ac/withenable.ac \
$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
$(top_srcdir)/../texk/xdv2pdf/ac/withenable.ac \
+ $(top_srcdir)/../texk/xdvik/ac/withenable.ac \
$(top_srcdir)/../texk/xdvipdfmx/ac/withenable.ac \
$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 75513e7d4fb..38b510ce46a 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -718,6 +718,7 @@ enable_dvidvi
enable_dviljk
enable_dvipdfm
enable_dvipdfmx
+enable_dvipng
enable_dvipos
enable_dvipsk
enable_gsftopk
@@ -743,6 +744,7 @@ enable_tex4htk
enable_ttf2pk
enable_ttfdump
enable_xdv2pdf
+enable_xdvik
enable_xdvipdfmx
with_system_kpathsea
with_kpathsea_includes
@@ -1463,6 +1465,7 @@ Optional Features:
--disable-dviljk do not build the dviljk package
--disable-dvipdfm do not build the dvipdfm package
--disable-dvipdfmx do not build the dvipdfmx package
+ --disable-dvipng do not build the dvipng package
--disable-dvipos do not build the dvipos package
--disable-dvipsk do not build the dvipsk package
--disable-gsftopk do not build the gsftopk package
@@ -1491,6 +1494,7 @@ Optional Features:
--disable-ttf2pk do not build the ttf2pk package
--disable-ttfdump do not build the ttfdump package
--disable-xdv2pdf do not build the xdv2pdf package
+ --disable-xdvik do not build the xdvik package
--disable-xdvipdfmx do not build the xdvipdfmx package
--disable-mktexmf-default do not run mktexmf if MF source missing
--disable-mktexpk-default do not run mktexpk if PK font missing
@@ -2552,6 +2556,28 @@ test "x$enable_dvipdfmx" = xno || {
}
+## texk/dvipng/ac/withenable.ac
+## configure options and TL libraries required for dvipng
+# Check whether --enable-dvipng was given.
+if test "${enable_dvipng+set}" = set; then
+ enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+ yes|no);; #(
+ *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipng'" >&6;}
+ enable_dvipng=yes
+ ac_configure_args="$ac_configure_args '--enable-dvipng'";;
+esac
+
+test "x$enable_dvipng" = xno || {
+ need_kpathsea=yes
+ need_freetype2=yes
+ need_gd=yes
+ need_t1lib=yes
+}
+
+
## texk/dvipos/ac/withenable.ac
## configure options and TL libraries required for dvipos
# Check whether --enable-dvipos was given.
@@ -2857,6 +2883,26 @@ test "x$enable_xdv2pdf" = xno || {
}
+## texk/xdvik/ac/withenable.ac
+## configure options and TL libraries required for xdvik
+# Check whether --enable-xdvik was given.
+if test "${enable_xdvik+set}" = set; then
+ enableval=$enable_xdvik;
+fi
+case $enable_xdvik in #(
+ yes|no);; #(
+ *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvik'" >&6;}
+ enable_xdvik=yes
+ ac_configure_args="$ac_configure_args '--enable-xdvik'";;
+esac
+
+test "x$enable_xdvik" = xno || {
+ need_kpathsea=yes
+ need_t1lib=yes
+}
+
+
## texk/xdvipdfmx/ac/withenable.ac
## configure options and TL libraries required for xdvipdfmx
# Check whether --enable-xdvipdfmx was given.
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index ab31787ee42..c56eb6fac7d 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -52,7 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = gd.h
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
ARFLAGS = cru
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index bb0f2473159..0c1d5a4950e 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -4839,12 +4839,13 @@ fi
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
LIBS="$ZLIB_LIBS $LIBS"
+
{ $as_echo "$as_me:$LINENO: checking for deflate" >&5
$as_echo_n "checking for deflate... " >&6; }
if test "${ac_cv_func_deflate+set}" = set; then
@@ -5102,6 +5103,7 @@ _ACEOF
CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES"
LIBS="$LIBPNG_LIBS $LIBS"
+
{ $as_echo "$as_me:$LINENO: checking for png_create_read_struct" >&5
$as_echo_n "checking for png_create_read_struct... " >&6; }
if test "${ac_cv_func_png_create_read_struct+set}" = set; then
@@ -5356,14 +5358,18 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
fi
GD_TREE=gd-2.0.35
+ac_config_links="$ac_config_links gd.h:$GD_TREE/gd.h"
+
+
ac_config_files="$ac_config_files Makefile"
@@ -5841,6 +5847,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
+config_links="$ac_config_links"
config_commands="$ac_config_commands"
_ACEOF
@@ -5869,6 +5876,9 @@ $config_files
Configuration headers:
$config_headers
+Configuration links:
+$config_links
+
Configuration commands:
$config_commands
@@ -6002,6 +6012,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
+ "gd.h") CONFIG_LINKS="$CONFIG_LINKS gd.h:$GD_TREE/gd.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -6018,6 +6029,7 @@ done
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
@@ -6315,7 +6327,7 @@ $as_echo "$as_me: error: could not setup config headers machinery" >&2;}
fi # test -n "$CONFIG_HEADERS"
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS"
shift
for ac_tag
do
@@ -6649,7 +6661,42 @@ $as_echo X"$_am_arg" |
}
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
+ :L)
+ #
+ # CONFIG_LINK
+ #
+ if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
+ :
+ else
+ # Prefer the file from the source tree if names are identical.
+ if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
+ ac_source=$srcdir/$ac_source
+ fi
+
+ { $as_echo "$as_me:$LINENO: linking $ac_source to $ac_file" >&5
+$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
+
+ if test ! -r "$ac_source"; then
+ { { $as_echo "$as_me:$LINENO: error: $ac_source: file not found" >&5
+$as_echo "$as_me: error: $ac_source: file not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ rm -f "$ac_file"
+
+ # Try a relative symlink, then a hard link, then a copy.
+ case $srcdir in
+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
+ *) ac_rel_source=$ac_top_build_prefix$ac_source ;;
+ esac
+ ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
+ ln "$ac_source" "$ac_file" 2>/dev/null ||
+ cp -p "$ac_source" "$ac_file" ||
+ { { $as_echo "$as_me:$LINENO: error: cannot link or copy $ac_source to $ac_file" >&5
+$as_echo "$as_me: error: cannot link or copy $ac_source to $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ ;;
:C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac
index 4f43433fe22..2bd49f51610 100644
--- a/Build/source/libs/gd/configure.ac
+++ b/Build/source/libs/gd/configure.ac
@@ -53,31 +53,28 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-
-CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
-LIBS="$ZLIB_LIBS $LIBS"
+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.])
-CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES"
-LIBS="$LIBPNG_LIBS $LIBS"
+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.])
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+KPSE_RESTORE_FLAGS
fi
GD_TREE=gd-[]gd_version
AC_SUBST([GD_TREE])
+dnl Use $GD_TREE to exclude $GD_TREE/gd.h from DIST_COMMON
+AC_CONFIG_LINKS([gd.h:$GD_TREE/gd.h])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/Build/source/libs/graphite/Makefile.am b/Build/source/libs/graphite/Makefile.am
index 77b52dc6d1c..6227f6e5b18 100644
--- a/Build/source/libs/graphite/Makefile.am
+++ b/Build/source/libs/graphite/Makefile.am
@@ -49,7 +49,7 @@ EXTRA_DIST = \
## in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn`
+ rm -rf `find $(distdir) -name .svn`
libgraphite_a_SOURCES = \
src/font/FileFont.cpp \
diff --git a/Build/source/libs/graphite/Makefile.in b/Build/source/libs/graphite/Makefile.in
index 58c35cdec94..5a03fa55921 100644
--- a/Build/source/libs/graphite/Makefile.in
+++ b/Build/source/libs/graphite/Makefile.in
@@ -1052,7 +1052,7 @@ uninstall-am:
dist-hook:
- rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn`
+ rm -rf `find $(distdir) -name .svn`
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure
index bd3896c9e5d..3c6a64a92fc 100755
--- a/Build/source/libs/libpng/configure
+++ b/Build/source/libs/libpng/configure
@@ -5136,12 +5136,13 @@ fi
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
LIBS="$ZLIB_LIBS $LIBS"
+
{ $as_echo "$as_me:$LINENO: checking for zlibVersion" >&5
$as_echo_n "checking for zlibVersion... " >&6; }
if test "${ac_cv_func_zlibVersion+set}" = set; then
@@ -5236,8 +5237,9 @@ $as_echo "$as_me: error: zlib not found" >&2;}
fi
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
fi
diff --git a/Build/source/libs/libpng/configure.ac b/Build/source/libs/libpng/configure.ac
index 62fa5f666bc..c4b0f2ac225 100644
--- a/Build/source/libs/libpng/configure.ac
+++ b/Build/source/libs/libpng/configure.ac
@@ -53,16 +53,11 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-
-CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
-LIBS="$ZLIB_LIBS $LIBS"
+KPSE_ADD_FLAGS([zlib])
AC_CHECK_FUNC([zlibVersion], , [AC_ERROR([zlib not found])])
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+KPSE_RESTORE_FLAGS
fi
diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure
index 55d93fee647..b963ee153fc 100755
--- a/Build/source/libs/teckit/configure
+++ b/Build/source/libs/teckit/configure
@@ -5305,12 +5305,13 @@ fi
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
LIBS="$ZLIB_LIBS $LIBS"
+
{ $as_echo "$as_me:$LINENO: checking for compress" >&5
$as_echo_n "checking for compress... " >&6; }
if test "${ac_cv_func_compress+set}" = set; then
@@ -5565,8 +5566,9 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
fi
diff --git a/Build/source/libs/teckit/configure.ac b/Build/source/libs/teckit/configure.ac
index 044349b019a..fa377cd3d89 100644
--- a/Build/source/libs/teckit/configure.ac
+++ b/Build/source/libs/teckit/configure.ac
@@ -37,18 +37,13 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-
-CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
-LIBS="$ZLIB_LIBS $LIBS"
+KPSE_ADD_FLAGS([zlib])
AC_CHECK_FUNC([compress], , [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.])
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+KPSE_RESTORE_FLAGS
fi