diff options
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/dvipng/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipng/Makefile.am | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipng/Makefile.in | 3 | ||||
-rwxr-xr-x | Build/source/texk/dvipng/configure | 79 | ||||
-rw-r--r-- | Build/source/texk/dvipng/configure.ac | 35 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/am/libpdftex.am | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/am/pdftosrc.am | 6 |
9 files changed, 98 insertions, 53 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index d8e0396c9a9..61dd8aacf7b 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2010-01-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, configure.ac: Rearrange for 'on demand' build. + 2009-11-03 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Proxy build system for TeX Live, diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 433264f432e..e36a4a43340 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 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -83,10 +83,11 @@ $(dvipng_OBJECTS): config.force config.force: $(dvipng_dependencies) echo timestamp >config.force $(SHELL) ./config.status --recheck + $(SHELL) ./config.status Makefile config.h DISTCLEANFILES = config.force -LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(GD_LIBS) +LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) ## Rebuild libkpathsea diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 15932451fe6..2002436a538 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -340,7 +340,7 @@ dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \ $(LIBPNG_DEPEND) $(T1LIB_DEPEND) $(FREETYPE2_DEPEND) \ $(GD_DEPEND) DISTCLEANFILES = config.force -LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(GD_LIBS) $(T1LIB_LIBS) \ +LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \ $(LIBPNG_LIBS) $(ZLIB_LIBS) TESTS = dvipng.test TESTS_ENVIRONMENT = DVIPNG_TREE='$(DVIPNG_TREE)' @@ -1306,6 +1306,7 @@ $(dvipng_OBJECTS): config.force config.force: $(dvipng_dependencies) echo timestamp >config.force $(SHELL) ./config.status --recheck + $(SHELL) ./config.status Makefile config.h @KPATHSEA_RULE@ @FREETYPE2_RULE@ diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 15e863e15ea..c7d87bd9176 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -15034,9 +15034,32 @@ else fi +eval CPPFLAGS=\"$T1LIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$T1LIB_LIBS \$LIBS\" + +ac_fn_c_check_func "$LINENO" "T1_InitLib" "ac_cv_func_T1_InitLib" +if test "x$ac_cv_func_T1_InitLib" = x""yes; then : + have_ft2_or_t1=yes + +$as_echo "#define HAVE_LIBT1 1" >>confdefs.h + +else + have_ft2_or_t1=no +fi + + 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" = x""yes; then : + have_ft2_or_t1=yes + +$as_echo "#define HAVE_FT2 1" >>confdefs.h + +fi + + eval CPPFLAGS=\"$GD_INCLUDES \$CPPFLAGS\" eval LIBS=\"$GD_LIBS \$LIBS\" @@ -15099,32 +15122,6 @@ $as_echo "#define HAVE_KPSE_ENC_FORMATS 1" >>confdefs.h fi -eval CPPFLAGS=\"$T1LIB_INCLUDES \$CPPFLAGS\" -eval LIBS=\"$T1LIB_LIBS \$LIBS\" - -ac_fn_c_check_func "$LINENO" "T1_InitLib" "ac_cv_func_T1_InitLib" -if test "x$ac_cv_func_T1_InitLib" = x""yes; then : - have_ft2_or_t1=yes - -$as_echo "#define HAVE_LIBT1 1" >>confdefs.h - -else - have_ft2_or_t1=no -fi - - -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" = x""yes; then : - have_ft2_or_t1=yes - -$as_echo "#define HAVE_FT2 1" >>confdefs.h - -fi - - # Checks for more header files. for ac_header in gd.h png.h kpathsea/kpathsea.h do : @@ -15175,6 +15172,28 @@ LIBS=$kpse_save_LIBS echo timestamp >config.force + +else + +# For TeX Live we always have t1lib and freetype2. + if true; then + have_t1_TRUE= + have_t1_FALSE='#' +else + have_t1_TRUE='#' + have_t1_FALSE= +fi + + if true; then + have_ft2_TRUE= + have_ft2_FALSE='#' +else + have_ft2_TRUE='#' + have_ft2_FALSE= +fi + +have_ft2_or_t1=yes + fi if test "x$ac_cv_func_T1_InitLib" = xyes; then @@ -15389,6 +15408,14 @@ if test -z "${have_ft2_TRUE}" && test -z "${have_ft2_FALSE}"; then as_fn_error "conditional \"have_ft2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${have_t1_TRUE}" && test -z "${have_t1_FALSE}"; then + as_fn_error "conditional \"have_t1\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${have_ft2_TRUE}" && test -z "${have_ft2_FALSE}"; then + as_fn_error "conditional \"have_ft2\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${have_ft2_or_t1_TRUE}" && test -z "${have_ft2_or_t1_FALSE}"; then as_fn_error "conditional \"have_ft2_or_t1\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index bd1d10e14f1..afece4cf058 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 2010 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, @@ -110,7 +110,19 @@ AC_CHECK_FUNC([png_read_image], [Define to 1 if you have the `png' library (-lpng).])], [AC_MSG_ERROR([cannot find/use libpng])]) +KPSE_ADD_FLAGS([t1lib]) +AC_CHECK_FUNC([T1_InitLib], + [have_ft2_or_t1=yes + AC_DEFINE([HAVE_LIBT1], 1, + [Define to 1 if you have the `t1' library (-lt1).])], + [have_ft2_or_t1=no]) + KPSE_ADD_FLAGS([freetype2]) +AC_CHECK_FUNC([FT_Init_FreeType], + [have_ft2_or_t1=yes + AC_DEFINE([HAVE_FT2], 1, + [Define to 1 if you have freetype2.])]) + KPSE_ADD_FLAGS([gd]) AC_CHECK_FUNC([gdImageCreate], [AC_DEFINE([HAVE_LIBGD], 1, @@ -130,19 +142,6 @@ KPSE_CHECK_KPSE_FORMAT([opentype], [AC_DEFINE([HAVE_KPSE_ENC_FORMATS], 1, [Define to 1 if your kpathsea has kpse_enc_format.])]) -KPSE_ADD_FLAGS([t1lib]) -AC_CHECK_FUNC([T1_InitLib], - [have_ft2_or_t1=yes - AC_DEFINE([HAVE_LIBT1], 1, - [Define to 1 if you have the `t1' library (-lt1).])], - [have_ft2_or_t1=no]) - -KPSE_ADD_FLAGS([freetype2]) -AC_CHECK_FUNC([FT_Init_FreeType], - [have_ft2_or_t1=yes - AC_DEFINE([HAVE_FT2], 1, - [Define to 1 if you have freetype2.])]) - # Checks for more header files. AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h], , [AC_MSG_ERROR([cannot find/use $ac_header])]) @@ -154,6 +153,14 @@ AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImag KPSE_RESTORE_FLAGS echo timestamp >config.force + +else + +# For TeX Live we always have t1lib and freetype2. +AM_CONDITIONAL([have_t1], [true]) +AM_CONDITIONAL([have_ft2], [true]) +have_ft2_or_t1=yes + fi AM_CONDITIONAL([have_t1], [test "x$ac_cv_func_T1_InitLib" = xyes]) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1b3b0908e44..f6375aa09ec 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -1611,7 +1611,7 @@ pdftosrc_CPPFLAGS = $(pdftex_cppflags) pdftosrc_CXXFLAGS = # $(WARNING_CXXFLAGS) pdftosrc_SOURCES = pdftexdir/pdftosrc.cc pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD) -pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a +pdftosrc_DEPENDENCIES = $(pdftex_dependencies) # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx @@ -8303,10 +8303,10 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) $(tie) -c pdftex.ch $(pdftex_ch_srcs) -# We must create pdftexd.h before building the libpdftex_a_OBJECTS. -$(libpdftex_a_OBJECTS): pdftexd.h +# We must create pdftexd.h (and xpdf) before building the libpdftex_a_OBJECTS. +$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) -$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libpdftex.a +$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) # We must create libluatex.a and libmplib.a before building the luatex_OBJECTS. $(luatex_OBJECTS): libluatex.a libmplib.a diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 78d059f5b04..5fe23fec6b8 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-01-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libpdftex.am: Add dependency on $(XPDF_DEPEND). + * am/pdftosrc.am: Remove dependency on libpdftex.a. + 2010-01-18 Peter Breitenlohner <peb@mppmu.mpg.de> * epdf.c: Remove extern delaration of register_fd_entry(). diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am index e488d50a721..d3abf434616 100644 --- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am @@ -1,6 +1,6 @@ ## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libpdftex @@ -48,8 +48,8 @@ libpdftex_a_SOURCES += \ pdftexdir/regex/regex.h endif MINGW32 -# We must create pdftexd.h before building the libpdftex_a_OBJECTS. -$(libpdftex_a_OBJECTS): pdftexd.h +# We must create pdftexd.h (and xpdf) before building the libpdftex_a_OBJECTS. +$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) ## included by pdftexdir/writettf.c EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am index 78f2015c860..c29521c4e93 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am @@ -1,6 +1,6 @@ ## texk/web2c/pdftexdir/am/pdftosrc.am: Makefile fragment for pdftosrc. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## pdftosrc @@ -20,7 +20,7 @@ pdftosrc_SOURCES = pdftexdir/pdftosrc.cc pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD) -pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a +pdftosrc_DEPENDENCIES = $(pdftex_dependencies) -$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libpdftex.a +$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) |