diff options
| author | Martin Schröder <martin@oneiros.de> | 2006-12-26 23:37:34 +0000 |
|---|---|---|
| committer | Martin Schröder <martin@oneiros.de> | 2006-12-26 23:37:34 +0000 |
| commit | 812aa90acbef4930ae356ab194f3f2a8f573f6e4 (patch) | |
| tree | a1b8b3d895238994c60580df9e6f0619b2034923 /Build/source/configure | |
| parent | e3bba99884ce591c9485122e96fff7071fc7c112 (diff) | |
Import pdftex 1.40-rc4, which also changes the signature of
print_version_and_exit, and adds a new library (libs/obsdcompat).
git-svn-id: svn://tug.org/texlive/trunk@2959 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
| -rwxr-xr-x | Build/source/configure | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/Build/source/configure b/Build/source/configure index 609f72000b7..04209966065 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -3389,6 +3389,7 @@ FREETYPEDIR=libs/freetype FREETYPE2DIR=libs/freetype2 ICUDIR=libs/icu-xetex TECKITDIR=libs/teckit +LIBOBSDCOMPATDIR=libs/obsdcompat GDDIR=libs/gd test "$no_x" = yes && { with_xdvik=no; with_oxdvik=no; } @@ -3437,6 +3438,13 @@ test "$with_xetex" != no && : ${needs_libxpdf=yes} : ${needs_libxpdf=no} export needs_libxpdf +# we need libobsdcompat for pdftex +test ! -d $srcdir/$LIBOBSDCOMPATDIR && : ${needs_obsdcompat=no} +test "$with_pdftex" != no && : ${needs_obsdcompat=yes} +test "$with_pdfetex" != no && : ${needs_obsdcompat=yes} +: ${needs_obsdcompat=no} +export needs_obsdcompat + # we need gd for dvipng test ! -d $srcdir/$GDDIR && : ${needs_gd=no} test "$with_dvipng" != no && : ${needs_gd=yes} @@ -4780,11 +4788,18 @@ else fi +if test "$needs_obsdcompat" = no; then + LIBOBSDCFLAGS= + LDLIBOBSD= + LIBOBSDDEP= +else + LIBOBSDCFLAGS='-I$(LIBOBSDDIR)' + LDLIBOBSD='$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a' + LIBOBSDDEP='$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a' +fi - - -LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $TECKITDEP" +LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $TECKITDEP $LIBOBSDDEP" LIBSDIRS= test "$needs_ncurses" = yes && test "$using_system_ncurses" != yes \ @@ -4807,6 +4822,8 @@ test "$needs_icu" = yes && test "$using_system_icu" != yes \ && LIBSDIRS="$ICUDIR $LIBSDIRS" test "$needs_teckit" = yes \ && LIBSDIRS="$TECKITDIR $LIBSDIRS" +test "$needs_obsdcompat" = yes \ + && LIBSDIRS="$LIBOBSDCOMPATDIR $LIBSDIRS" subdirs="$subdirs libs" @@ -5041,6 +5058,9 @@ s%@CURSESDEP@%$CURSESDEP%g s%@LIBXPDFCPPFLAGS@%$LIBXPDFCPPFLAGS%g s%@LDLIBXPDF@%$LDLIBXPDF%g s%@LIBXPDFDEP@%$LIBXPDFDEP%g +s%@LIBOBSDCFLAGS@%$LIBOBSDCFLAGS%g +s%@LDLIBOBSD@%$LDLIBOBSD%g +s%@LIBOBSDDEP@%$LIBOBSDDEP%g s%@LIBT1CPPFLAGS@%$LIBT1CPPFLAGS%g s%@LDLIBT1@%$LDLIBT1%g s%@LIBT1DEP@%$LIBT1DEP%g |