summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-19 07:17:16 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-19 07:17:16 +0000
commit2f3c81b048f3816cc47cc5d5bc4e31675fff556a (patch)
tree3c42eafadaaa2c9d7446d5056d5754915a3bfbea /Build/source
parentd48840293d264a628b2432cac087c33012c069da (diff)
build system [WIN32]: Reorganize adding '-lgdi32' to POPPLER_LIBS and XPDF_LIBS
git-svn-id: svn://tug.org/texlive/trunk@28029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-poppler-flags.m410
-rw-r--r--Build/source/m4/kpse-xpdf-flags.m410
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rwxr-xr-xBuild/source/texk/web2c/configure3
-rw-r--r--Build/source/texk/web2c/configure.ac1
6 files changed, 24 insertions, 10 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 2f89522168c..90a04b9eacf 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-poppler-flags.m4 [WIN32]: Add '-lgdi32' to POPPLER_LIBS.
+ * kpse-xpdf-flags.m4 [WIN32]: Add '-lgdi32' to XPDF_LIBS.
+
2012-10-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-pkgs.m4 (kpse_libs_pkgs): Remove obsdcompat.
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index 29f741a97d4..029e495d64c 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -12,10 +12,12 @@
# Set the make variables POPPLER_INCLUDES and POPPLER_LIBS to the CPPFLAGS and
# LIBS required for the `-lpoppler' library in libs/poppler/ of the TL tree.
AC_DEFUN([KPSE_POPPLER_FLAGS],
-[_KPSE_LIB_FLAGS([poppler], [poppler], [],
- [-IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler],
- [BLD/libs/poppler/libpoppler.a], [],
- [], [${top_builddir}/../../libs/poppler/poppler/Stream.h])[]dnl
+[AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+_KPSE_LIB_FLAGS([poppler], [poppler], [],
+ [-IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler],
+ [BLD/libs/poppler/libpoppler.a], [],
+ [], [${top_builddir}/../../libs/poppler/poppler/Stream.h])[]dnl
+test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
]) # KPSE_POPPLER_FLAGS
# KPSE_POPPLER_OPTIONS([WITH-SYSTEM])
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index ceb32dffb5b..8b3afd369a2 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -12,10 +12,12 @@
# Set the make variables XPDF_INCLUDES and XPDF_LIBS to the CPPFLAGS and
# LIBS required for the `-lxpdf' library in libs/xpdf/ of the TL tree.
AC_DEFUN([KPSE_XPDF_FLAGS],
-[_KPSE_LIB_FLAGS([xpdf], [xpdf], [],
- [-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf],
- [BLD/libs/xpdf/libxpdf.a], [],
- [], [${top_builddir}/../../libs/xpdf/xpdf/Stream.h])[]dnl
+[AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+_KPSE_LIB_FLAGS([xpdf], [xpdf], [],
+ [-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf],
+ [BLD/libs/xpdf/libxpdf.a], [],
+ [], [${top_builddir}/../../libs/xpdf/xpdf/Stream.h])[]dnl
+test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
]) # KPSE_XPDF_FLAGS
# KPSE_XPDF_OPTIONS([WITH-SYSTEM])
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 42c370001c8..320d41f15dd 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac (POPPLER): Adding '-lgdi32' for WIN32 now done
+ in KPSE_POPPLER_FLAGS (../../m4/kpse-poppler-flags.m4).
+
2012-10-12 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* texmfmp.h: Support pipe except for tex.
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 1b727c61a57..8c710f9ced7 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -22663,6 +22663,7 @@ $(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h
${top_builddir}/../../libs/xpdf/xpdf/Stream.h:
cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
@@ -22688,8 +22689,8 @@ $(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/poppler/Stream.h
${top_builddir}/../../libs/poppler/poppler/Stream.h:
cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
-
test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
+
## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
# Check whether --with-system-zziplib was given.
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index a075e751c4c..c9e62a8c2b5 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -267,7 +267,6 @@ KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
KPSE_XPDF_FLAGS
KPSE_POPPLER_FLAGS
-test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
KPSE_ZZIPLIB_FLAGS
KPSE_GRAPHITE_FLAGS
KPSE_FREETYPE2_FLAGS