summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-27 09:46:39 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-27 09:46:39 +0000
commit548c801baf05f4a158b42c8de28378a2a44bfa89 (patch)
treee2ee4779c72604a8838da3a8c6fe2e3774db0a20 /Build/source/texk/dvipdfmx
parente4da8ade35c41f81e0f39a6fb40af0e50d1e0c8b (diff)
change ipc default to enabled, remove obsolete files
git-svn-id: svn://tug.org/texlive/trunk@13492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx')
-rw-r--r--Build/source/texk/dvipdfmx/ChangeLog.TL4
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.am8
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.am.orig6
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/configure.in.orig149
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.am4
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.am.orig43
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.in1
8 files changed, 9 insertions, 208 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
index fba4c767ca7..c479ac5c195 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/dvipdfmx/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for dvipdfmx (teTeX / TeX Live)
=====================================================
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2009-05-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdfdoc.c (pdf_doc_get_page): Avoid C99isms
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index eea486dc358..670bb1d70b8 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/dtl/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -5,7 +9,3 @@ SUBDIRS = data src
EXTRA_DIST = ChangeLog.TL
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.am.orig configure.in.orig
-
diff --git a/Build/source/texk/dvipdfmx/Makefile.am.orig b/Build/source/texk/dvipdfmx/Makefile.am.orig
deleted file mode 100644
index c7b1787e9f0..00000000000
--- a/Build/source/texk/dvipdfmx/Makefile.am.orig
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = data src
-ACLOCAL_AMFLAGS = -I m4
-
-# to regenerate autofiles, run
-# aclocal -I m4 && autoconf && autoheader && automake
-# tested with autoconf 2.62 and automake 1.10.1. --karl, 21apr08.
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index ad98a955948..057a4e35e49 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -244,7 +244,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = data src
-EXTRA_DIST = ChangeLog.TL Makefile.am.orig configure.in.orig
+EXTRA_DIST = ChangeLog.TL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Build/source/texk/dvipdfmx/configure.in.orig b/Build/source/texk/dvipdfmx/configure.in.orig
deleted file mode 100644
index b7d3b21514f..00000000000
--- a/Build/source/texk/dvipdfmx/configure.in.orig
+++ /dev/null
@@ -1,149 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/dvipdfmx.c)
-AM_INIT_AUTOMAKE(dvipdfmx, 20080607)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-# Building inside teTeX or TeX Live?
-AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX installation])
-
-
-dnl Check for kpathsea library. (required)
-if test "x$enable_tetex_build" = xyes; then
- # In teTeX and TeX Live, LDFLAGS is passed by texk/Makefile and
- # reserved for the user. Therefore we need another variable for the
- # loader flags to find the local kpathsea. We use dvipdfmx_LDFLAGS
- # since Automake already sets that up in the link command.
- dvipdfmx_LDFLAGS=
- AC_SUBST(dvipdfmx_LDFLAGS)
-
- if test ! -d $srcdir/../../texk/kpathsea; then
- AC_MSG_ERROR([
-=========================================
-
-You specified --enable-tetex-build, but I can't find the kpathsea
-directory. I expected it to be in $srcdir/../../texk/kpathsea.
-
-=========================================])
- fi
- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/../../texk -I\$(top_srcdir)/../../texk"
- dvipdfmx_LDFLAGS="-L\$(top_builddir)/../../texk/kpathsea/.libs"
-
- AM_CONDITIONAL(TDS_VERSION_11, true)
- AC_DEFINE([__TDS_VERSION__], 0x200406L)
-else
- dnl Don't bother going further if we don't have kpse installed.
- AC_ARG_WITH(kpathsea,
- [ --with-kpathsea=DIR use kpathsea include/library files from DIR], [
- if test -d "$withval"; then
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- fi
- ], [
- if test -d "$prefix"; then
- CPPFLAGS="$CPPFLAGS -I$prefix/include"
- LDFLAGS="$LDFLAGS -L$prefix/lib"
- else
- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
- fi
- ])
-
- AC_CHECK_LIB(kpathsea, kpse_find_file, [LIBS="-lkpathsea $LIBS"],
- AC_MSG_ERROR([kpathsea library not found
-This version of dvipdfmx requires the kpathsea library and its headers. If
-you know where it is you might try setting the LDFLAGS environment variable
-with -L pointing to the directory containing libkpathsea.a.
- ])
- )
-
- dnl Check kpathsea support for required formats and funcs.
- CHO_CHECK_KPSE_SUPPORT([dvipdfmx])
-
- dnl Check for TDS version kpathsea library supports.
- CHO_CHECK_KPSE_TDS_VERSION
-fi
-
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h)
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(open close system getenv mkstemp basename)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-MAW_EXT_TIMEZONE
-MAW_TZ_HAS_TM_GMTOFF
-
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-AC_STRUCT_TIMEZONE
-AC_C_BIGENDIAN
-
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-
-dnl Check for additional libraries.
-if test "x$enable_tetex_build" = xyes; then
- # Get these common libraries from the sources, too.
- # Seems like it would be simpler to treat kpathsea this way too, but
- # we're just starting from what lcdf-typetools did.
- sinclude(../../libs/zlib/withenable.ac)
- sinclude(../../libs/zlib/zlib.ac)
-
- sinclude(../../libs/libpng/withenable.ac)
- sinclude(../../libs/libpng/libpng.ac)
-
- # yes, we have zlib and png.
- AC_DEFINE(HAVE_ZLIB)
- AC_DEFINE(HAVE_LIBPNG)
-
- # You must define HAVE_ZLIB_COMPRESS2 to enable '-z' option for controlling
- # zlib compression level, but zlib.ac included above does not do this test.
- # We assume zlib always has compress2() here although that's not always true.
- AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1)
-
- # tetex/tex live build; this always has kpathsea, xbasename, etc.,
- # as we're building from current sources. Do this stuff at the end so
- # other configure tests don't try to link with kpathsea (which doesn't
- # exist at configure time).
- LIBS="-lkpathsea -lm $LIBS"
- AC_MSG_NOTICE([tetex build enabled, LIBS now: $LIBS])
-else
- CHO_HAS_LIBPAPER
- CHO_HAS_ZLIB
- CHO_HAS_LIBPNG
-
-dnl these variables are defined in the tetex case and used in src/Makefile.am.
-dnl just let them be empty.
- AC_SUBST(LIBPNGCPPFLAGS)
- AC_SUBST(LDLIBPNG)
- AC_SUBST(LIBPNGDEP)
- AC_SUBST(ZLIBCPPFLAGS)
- AC_SUBST(LDZLIB)
- AC_SUBST(ZLIBDEP)
- AC_SUBST(dvipdfmx_LDFLAGS)
-fi
-
-AC_CONFIG_FILES([Makefile data/Makefile src/Makefile])
-AC_OUTPUT
-
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am
index 341b8807f05..0a39cdfb9eb 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.am
+++ b/Build/source/texk/dvipdfmx/src/Makefile.am
@@ -52,7 +52,3 @@ uninstall-hook:
rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
-## Eventually delete these files
-##
-EXTRA_DIST = Makefile.am.orig
-
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am.orig b/Build/source/texk/dvipdfmx/src/Makefile.am.orig
deleted file mode 100644
index 61469a3205c..00000000000
--- a/Build/source/texk/dvipdfmx/src/Makefile.am.orig
+++ /dev/null
@@ -1,43 +0,0 @@
-bin_PROGRAMS = dvipdfmx
-dvipdfmx_SOURCES = agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
-cmap.c cmap_read.c cmap_write.c cs_type2.c \
-dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \
-dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c mfileio.c mpost.c \
-numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c pdfdraw.c pdfencoding.c \
-pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c pdfresource.c pdfximage.c \
-pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \
-spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c spc_tpic.c spc_util.c specials.c \
-subfont.c tfm.c \
-tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
-type0.c t1_char.c t1_load.c type1.c type1c.c \
-unicode.c vf.c xbb.c \
-agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
-cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
-cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
-jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
-pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h pdflimits.h pdfnames.h pdfobj.h \
-pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h pst_obj.h sfnt.h \
-spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h spc_tpic.h spc_util.h specials.h \
-subfont.h system.h tfm.h \
-tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \
-type0.h t1_char.h t1_load.h type1.h type1c.h \
-unicode.h vf.h xbb.h
-
-LIBPNGDIR=$(top_builddir)/../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
-
-ZLIBDIR=$(top_builddir)/../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
-
-dvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@
-dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
-dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP)
-dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
-
-install-exec-hook:
- cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
- cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in
index 42bc98da8b0..8cc0fd2b5b0 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/src/Makefile.in
@@ -251,7 +251,6 @@ dvipdfmx_SOURCES = \
dvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND)
LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
-EXTRA_DIST = Makefile.am.orig
all: all-am
.SUFFIXES: