diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-06-28 08:19:32 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-06-28 08:19:32 +0000 |
| commit | ea29734980e35bf08284e316e79cee37a1b53d8f (patch) | |
| tree | 2a624f8d6956b0f677259c71340f0fe521883460 | |
| parent | d1028259a790fbbef87c2ce47f046057f15489ab (diff) | |
pdfTeX: revert parts of previous change (26905)
git-svn-id: svn://tug.org/texlive/trunk@26906 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/am/libpdftex.am | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/utils.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am index c7c5042585f..32cb0e889d1 100644 --- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am @@ -1,13 +1,13 @@ ## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libpdftex ## EXTRA_LIBRARIES += libpdftex.a -libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags) +libpdftex_a_CPPFLAGS = $(pdftex_cppflags) libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libpdftex_a_SOURCES = \ @@ -41,7 +41,6 @@ libpdftex_a_SOURCES = \ pdftexdir/writezip.c if MINGW32 -REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex libpdftex_a_SOURCES += \ pdftexdir/regex/regex.c \ pdftexdir/regex/regex.h diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c index af8794df243..776a99dd7e5 100644 --- a/Build/source/texk/web2c/pdftexdir/utils.c +++ b/Build/source/texk/web2c/pdftexdir/utils.c @@ -25,7 +25,11 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #else #include <sysexits.h> #endif +#ifdef __MINGW32__ +#include <regex/regex.h> +#else #include <regex.h> +#endif #include <kpathsea/c-proto.h> #include <kpathsea/c-stat.h> #include <kpathsea/c-fopen.h> |