diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-10 07:16:54 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-10 07:16:54 +0000 |
commit | 9ca480758d9c1627299b19f1cb7419c84b57980f (patch) | |
tree | c074a72701f339181bc7dce7e0fcefa304cf145a /Build/source/texk/web2c | |
parent | 797af7cfbc26309d5da4a63df5c0353bca06ed7c (diff) |
libs/obsdcompat: No longer used and therefore removed
git-svn-id: svn://tug.org/texlive/trunk@27934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
29 files changed, 58 insertions, 103 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 2471866718e..c02e71d2229 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2012-10-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ac/web2c.ac (kpse_tex_progs): Remove obsdcompat. + * configure.ac: Remove KPSE_OBSDCOMPAT_FLAGS. + * Makefile.am: Remove OBSDCOMPAT_RULE. + 2012-08-01 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac (AC_CHECK_FUNCS): Remove test for snprintf. diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 676be50ab57..bd99710effc 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/ ## -## 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. ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 @@ -91,8 +91,6 @@ $(proglib): ${srcdir}/lib/*.c @XPDF_RULE@ ## Rebuild poppler @POPPLER_RULE@ -## Rebuild libopenbsd-compat -@OBSDCOMPAT_RULE@ ## Rebuild libzzip @ZZIPLIB_RULE@ ## Rebuild libgraphite diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 6abf7b5c14c..987c7afa865 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -329,7 +329,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -768,8 +767,8 @@ am_luatex_OBJECTS = luatex-luatex.$(OBJEXT) luatex_OBJECTS = $(am_luatex_OBJECTS) am__DEPENDENCIES_6 = libluatex.a libff.a libluamisc.a libluasocket.a \ liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) libmd5.a libmplib.a + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a \ + libmplib.a luatex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(luatex_CXXFLAGS) $(CXXFLAGS) \ $(luatex_LDFLAGS) $(LDFLAGS) -o $@ @@ -841,7 +840,7 @@ am__objects_19 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) nodist_pdftex_OBJECTS = $(am__objects_19) pdftex-pdftex-pool.$(OBJEXT) pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS) am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a + $(am__DEPENDENCIES_1) libmd5.a pdftex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(pdftex_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -1269,9 +1268,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -2100,14 +2096,12 @@ euptex_ch_srcs = \ tex-binpool.ch pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ - $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ - -I$(srcdir)/pdftexdir + $(XPDF_INCLUDES) -I$(srcdir)/libmd5 -I$(srcdir)/pdftexdir # used for both pdftex and pdftosrc. -pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) \ - $(OBSDCOMPAT_LIBS) libmd5.a +pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) libmd5.a pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \ - $(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a + $(ZLIB_DEPEND) $(XPDF_DEPEND) libmd5.a # Force Automake to use CXXLD for linking nodist_EXTRA_pdftex_SOURCES = dummy.cxx @@ -2172,19 +2166,19 @@ pdftosrc_tests = pdftexdir/pdftosrc.test # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ - $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ - -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \ - -I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H` \ - -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' + $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 -I$(srcdir)/luatexdir \ + -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir \ + -Dextra_version_info=`date +-%Y%m%d%H` -I$(srcdir)/synctexdir \ + -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a \ liblua51.a $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \ - $(POPPLER_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a + $(POPPLER_LIBS) libmd5.a libmplib.a luatex_LDFLAGS = -export-dynamic luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \ - $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) \ - $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a + $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) libmd5.a \ + libmplib.a luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" call_luatex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c @@ -2429,10 +2423,9 @@ libff_a_SOURCES = \ libluatex_a_DEPENDENCIES = libff.a libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) \ - -I$(srcdir)/libmd5 -I$(srcdir)/luatexdir \ - -I$(srcdir)/luatexdir/lua51 -DpdfTeX -I$(srcdir)/synctexdir \ - -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' + $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 \ + -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -DpdfTeX \ + -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libluatex_web = luatexdir/dvi/dvigen.w luatexdir/font/dofont.w \ luatexdir/font/luafont.w luatexdir/font/mapfile.w \ @@ -9456,7 +9449,6 @@ $(proglib): ${srcdir}/lib/*.c @LIBPNG_RULE@ @XPDF_RULE@ @POPPLER_RULE@ -@OBSDCOMPAT_RULE@ @ZZIPLIB_RULE@ @GRAPHITE_RULE@ @FREETYPE2_RULE@ @@ -10022,7 +10014,7 @@ pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) # We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS. $(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND) -$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) +$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(luatex_OBJECTS): libluatex.a diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index d7330f5ea82..c0e76c11549 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -1,6 +1,6 @@ ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ dnl -dnl Copyright (C) 2009-2011 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 for TeX and MF @@ -38,8 +38,8 @@ m4_define([kpse_tex_progs], [dnl [[uptex], [yes], [yes], [upTeX], [ptexenc]], [[euptex], [yes], [yes], [e-upTeX], [ptexenc]], [[aleph], [yes], [], [Aleph], []], -[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]], -[[luatex], [yes], [], [luaTeX], [poppler libpng obsdcompat zziplib]], +[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng]], +[[luatex], [yes], [], [luaTeX], [poppler libpng zziplib]], [[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu-xetex teckit graphite]], ])[]dnl m4_foreach([Kpse_Prog], [kpse_tex_progs], diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4 index 8e48a510cba..9c3444b37d1 100644 --- a/Build/source/texk/web2c/aclocal.m4 +++ b/Build/source/texk/web2c/aclocal.m4 @@ -1101,7 +1101,6 @@ m4_include([../../m4/kpse-lex.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) m4_include([../../m4/kpse-lt-hack.m4]) m4_include([../../m4/kpse-macos-framework.m4]) -m4_include([../../m4/kpse-obsdcompat-flags.m4]) m4_include([../../m4/kpse-poppler-flags.m4]) m4_include([../../m4/kpse-ptexenc-flags.m4]) m4_include([../../m4/kpse-socket-libs.m4]) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index fd54888a023..1b727c61a57 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -644,10 +644,6 @@ CTANGLE CTANGLEBOOT TANGLE TANGLEBOOT -OBSDCOMPAT_RULE -OBSDCOMPAT_DEPEND -OBSDCOMPAT_LIBS -OBSDCOMPAT_INCLUDES ICU_RULE ICU_DEPEND ICU_LIBS @@ -17857,7 +17853,6 @@ fi test "x$enable_web2c:$enable_pdftex" = xyes:yes && { need_xpdf=yes need_libpng=yes - need_obsdcompat=yes } # Check whether --enable-luatex was given. if test "${enable_luatex+set}" = set; then : @@ -17873,7 +17868,6 @@ esac test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_poppler=yes need_libpng=yes - need_obsdcompat=yes need_zziplib=yes } # Check whether --enable-xetex was given. @@ -22907,14 +22901,6 @@ $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h ${top_builddir}/../../libs/icu/include/unicode/uversion.h: cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' -## _KPSE_LIB_FLAGS: Setup obsdcompat (-lopenbsd-compat) flags - OBSDCOMPAT_INCLUDES="-I$kpse_BLD/libs/obsdcompat -I$kpse_SRC/libs/obsdcompat" - OBSDCOMPAT_LIBS="$kpse_BLD/libs/obsdcompat/libopenbsd-compat.a" - OBSDCOMPAT_DEPEND='${top_builddir}/../../libs/obsdcompat/libopenbsd-compat.a' - OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat -$(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch] - cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) rebuild' - # Check size of off_t (using <kpathsea/config.h>) eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 2bdf43f75fa..a075e751c4c 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -273,7 +273,6 @@ KPSE_GRAPHITE_FLAGS KPSE_FREETYPE2_FLAGS KPSE_TECKIT_FLAGS KPSE_ICU_XETEX_FLAGS([icule]) -KPSE_OBSDCOMPAT_FLAGS # Check size of off_t (using <kpathsea/config.h>) KPSE_ADD_FLAGS([kpathsea]) diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index ae47a7920b4..33a5ff6fac0 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -67,7 +67,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -221,9 +220,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index aa295295b72..153538edde8 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -69,7 +69,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -213,9 +212,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 8244539940a..9375e6ddc08 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,10 @@ +2012-10-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + The openbsd compat library is no longer used. + * image/epdf.h, lua/luainit.w, ptexlib.h, utils/utils.w: + Drop #include "openbsd-compat.h". + * am/libluatex.am, am/luatex.am: Remove OBSDCOMPAT_*. + 2012-09-19 Peter Breitenlohner <peb@mppmu.mpg.de> * lua/luainit.w (parse_options): Avoid cast const => non-const. diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 26e6c50d8db..93dd76815e8 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -10,7 +10,7 @@ EXTRA_LIBRARIES += libluatex.a libluatex_a_DEPENDENCIES = libff.a libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -libluatex_a_CPPFLAGS += $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 +libluatex_a_CPPFLAGS += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 libluatex_a_CPPFLAGS += -DpdfTeX libluatex_a_CPPFLAGS += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index c838b7e9167..2c8793dc8fb 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/luatex.am: Makefile fragment for luaTeX. ## -## 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. ## luaTeX @@ -21,7 +21,7 @@ EXTRA_PROGRAMS += luatex nodist_EXTRA_luatex_SOURCES = dummy.cxx luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -luatex_CPPFLAGS += $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 +luatex_CPPFLAGS += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 luatex_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` luatex_CPPFLAGS += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' @@ -29,7 +29,7 @@ luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a liblua51.a luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) -luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a +luatex_ldadd += libmd5.a libmplib.a luatex_LDFLAGS = -export-dynamic @@ -37,7 +37,7 @@ luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) -luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a +luatex_DEPENDENCIES += libmd5.a libmplib.a $(luatex_OBJECTS): libluatex.a diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h index 4e5060282ec..c3e23f404a4 100644 --- a/Build/source/texk/web2c/luatexdir/image/epdf.h +++ b/Build/source/texk/web2c/luatexdir/image/epdf.h @@ -76,7 +76,6 @@ extern "C" { # include <c-auto.h> /* define SIZEOF_LONG */ -# include "openbsd-compat.h" # include "image.h" # include "utils/avlstuff.h" # include "pdf/pdftypes.h" diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w index 4db90d73b95..4acd6e411d7 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.w +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w @@ -18,7 +18,6 @@ % with LuaTeX; if not, see <http://www.gnu.org/licenses/>. @ @c -#include "openbsd-compat.h" #include <kpathsea/c-stat.h> #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/ptexlib.h b/Build/source/texk/web2c/luatexdir/ptexlib.h index 6ae7492bab9..6169f1b7396 100644 --- a/Build/source/texk/web2c/luatexdir/ptexlib.h +++ b/Build/source/texk/web2c/luatexdir/ptexlib.h @@ -171,7 +171,6 @@ size_t T##_limit # include "utils/avlstuff.h" # include "utils/managed-sa.h" # include "image/writeimg.h" -# include "openbsd-compat.h" # include "dvi/dvigen.h" # include "pdf/pagetree.h" # include "pdf/pdfgen.h" diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.w b/Build/source/texk/web2c/luatexdir/utils/utils.w index d7f684c300c..47978b9f0f4 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.w +++ b/Build/source/texk/web2c/luatexdir/utils/utils.w @@ -24,7 +24,6 @@ static const char _svn_version[] = "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.70.x/source/texk/web2c/luatexdir/utils/utils.w $"; @ @c -#include "openbsd-compat.h" #include <kpathsea/config.h> /* this is a trick to load mingw32's io.h early, using a macro redefinition of |eof()|. */ #include "sys/types.h" diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index b6030eb09c8..662ff8f5cd4 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -83,7 +83,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -227,9 +226,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 2ca6ea5ac97..9a7badc0213 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -76,7 +76,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -236,9 +235,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 1b1405ffed9..122db00e243 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -75,7 +75,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -300,9 +299,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in index c032491e5a4..144a950881c 100644 --- a/Build/source/texk/web2c/otps/win32/Makefile.in +++ b/Build/source/texk/web2c/otps/win32/Makefile.in @@ -69,7 +69,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -205,9 +204,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index b522f7648bf..62eced410bc 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,10 @@ +2012-10-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + The openbsd compat library is no longer used. + * pdftoepdf.cc, ptexlib.h, utils.c: + Drop #include "openbsd-compat.h". + * am/pdftex.am, am/pdftosrc.am: Remove OBSDCOMPAT_*. + 2012-10-02 Peter Breitenlohner <peb@mppmu.mpg.de> Avoid (most) MinGW compiler warnings from regex code. diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index 4a626634963..18b7a371b29 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -3,17 +3,14 @@ ## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -pdftex_cppflags += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) +pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) pdftex_cppflags += -I$(srcdir)/libmd5 -I$(srcdir)/pdftexdir # used for both pdftex and pdftosrc. -pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) -pdftex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a +pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) libmd5.a pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) -pdftex_dependencies += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) -pdftex_dependencies += $(OBSDCOMPAT_DEPEND) libmd5.a +pdftex_dependencies += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) libmd5.a ## pdfTeX ## diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am index 1598812a519..c78a6287610 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-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. ## pdftosrc @@ -22,7 +22,7 @@ pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD) pdftosrc_DEPENDENCIES = $(pdftex_dependencies) -$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) +$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) ## Tests ## diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc index 358b726f045..5f601734eaf 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc @@ -65,8 +65,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. extern "C" { -#include <openbsd-compat.h> - #include <kpathsea/c-auto.h> #include <kpathsea/c-proto.h> #include <kpathsea/lib.h> diff --git a/Build/source/texk/web2c/pdftexdir/ptexlib.h b/Build/source/texk/web2c/pdftexdir/ptexlib.h index fabf09bd213..c8164381f6b 100644 --- a/Build/source/texk/web2c/pdftexdir/ptexlib.h +++ b/Build/source/texk/web2c/pdftexdir/ptexlib.h @@ -35,8 +35,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. /* avl */ # include "avlstuff.h" -# include "openbsd-compat.h" - /* pdftexlib type declarations */ typedef struct { const char *pdfname; diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c index f9012d0d935..7265b607e1e 100644 --- a/Build/source/texk/web2c/pdftexdir/utils.c +++ b/Build/source/texk/web2c/pdftexdir/utils.c @@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "openbsd-compat.h" - #include <sys/types.h> #include <regex.h> #include <kpathsea/config.h> diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index 4882f74d865..03f407db01f 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-10-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * synctex_parser_utils.h: Avoid definition of FALSE and TRUE + that may cause warnings. + 2012-09-06 Peter Breitenlohner <peb@mppmu.mpg.de> * synctex_main.c: Define snprintf and getcwd for WIN32. diff --git a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h index 18348aa6dca..f817853f5f8 100644 --- a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h +++ b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h @@ -61,14 +61,11 @@ authorization from the copyright holder. extern "C" { #endif -#define FALSE 0 -#define TRUE !FALSE - # if _WIN32 -# define SYNCTEX_CASE_SENSITIVE_PATH FALSE +# define SYNCTEX_CASE_SENSITIVE_PATH 0 # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c || '\\' == c) # else -# define SYNCTEX_CASE_SENSITIVE_PATH TRUE +# define SYNCTEX_CASE_SENSITIVE_PATH 1 # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c) # endif diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 3f433134ba8..0b97705d3f0 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -69,7 +69,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ @@ -211,9 +210,6 @@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ OBJCXXFLAGS = @OBJCXXFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ OTANGLE = @OTANGLE@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ |