texk/dvipng: Minor update of build system

git-svn-id: svn://tug.org/texlive/trunk@36454 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 43 insertions, 11 deletions

diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 3ed7f07ad9a..aea24a0e4df 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-win32.m4: Define KPSE_DO_IF_WIN32 for WIN32 only tests.
+
 2015-02-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-cairo-flags.m4: Require KPSE_PIXMAN_FLAGS.
diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4
index 9d6375404fa..8893ceb68c0 100644
--- a/Build/source/m4/kpse-win32.m4
+++ b/Build/source/m4/kpse-win32.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -68,3 +68,11 @@ AM_CONDITIONAL([WIN32_CALL],
 AM_COND_IF([WIN32],
            [AC_CONFIG_LINKS([callexe.c:../texlive/w32_wrapper/callexe.c])])
 ]) # KPSE_WIN32_CALL
+
+# KPSE_DO_IF_WIN32(COMMAND)
+# -------------------------
+# Execute COMMAND, if Windows.
+AC_DEFUN([KPSE_DO_IF_WIN32], [dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AS_IF([test "x$kpse_cv_have_win32" != xno], [$1])
+]) # KPSE_DO_IF_WIN32
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 3ac7a91cc4b..d62115ec589 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Check for texlive_gs_init(), if Windows.
+	* Makefile.am: Add '-DTEXLIVE' to AM_CPPFLAGS.
+	Drop unused DVIPS and TEXI2HTML.
+
 2015-03-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.15 from savannah.nongnu.org.
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 72e1d9c1cbb..09289c3c256 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -25,15 +25,11 @@ EXTRA_DIST += $(DVIPNG_TREE)-PATCHES
 include $(srcdir)/../../am/dist_hook.am
 NEVER_NAMES += $(NEVER_NAMES_SUB)
 
-AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE)
+AM_CPPFLAGS = -DTEXLIVE -I$(top_srcdir)/$(DVIPNG_TREE)
 AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES)
 AM_CPPFLAGS += $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 
-DVIPS = dvips -Ppdf
-
-TEXI2HTML = texi2html
-
 # In order that `make distcheck' succeeds, we must not attempt to rebuild
 # dvipng.info if dvipng.help has not changed,  Thus we delegate rebuilding
 # dvipng.help and dvipng.info, if necessary, to subdirectories.
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 9d89dda0b85..d7ce577e537 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -647,12 +647,10 @@ NEVER_DIST = `find . $(NEVER_NAMES)`
 NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
 NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
 NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
-AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \
-	$(FREETYPE2_INCLUDES) $(GD_INCLUDES) $(LIBPNG_INCLUDES) \
-	$(ZLIB_INCLUDES)
+AM_CPPFLAGS = -DTEXLIVE -I$(top_srcdir)/$(DVIPNG_TREE) \
+	$(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES) \
+	$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
-DVIPS = dvips -Ppdf
-TEXI2HTML = texi2html
 
 # In order that `make distcheck' succeeds, we must not attempt to rebuild
 # dvipng.info if dvipng.help has not changed,  Thus we delegate rebuilding
diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in
index ee3777b4ce0..dc860749206 100644
--- a/Build/source/texk/dvipng/config.h.in
+++ b/Build/source/texk/dvipng/config.h.in
@@ -195,6 +195,9 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
+/* Define to 1 if you have the `texlive_gs_init' function. */
+#undef HAVE_TEXLIVE_GS_INIT
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 6695da3b8cc..b7f3e7dc63a 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -16471,6 +16471,21 @@ fi
 done
 
 
+if test "x$kpse_cv_have_win32" != xno; then :
+  for ac_func in texlive_gs_init
+do :
+  ac_fn_c_check_func "$LINENO" "texlive_gs_init" "ac_cv_func_texlive_gs_init"
+if test "x$ac_cv_func_texlive_gs_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TEXLIVE_GS_INIT 1
+_ACEOF
+
+fi
+done
+
+fi
+
+
 # We need enc, cmap, and sfd formats.
 # Introduced together with opentype format (Dec 2003).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether kpathsea declares the kpse_opentype_format" >&5
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 16103dc8f93..a951c47be47 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -131,6 +131,8 @@ AC_CHECK_FUNC([kpse_set_program_name],
 
 AC_CHECK_FUNCS([kpse_program_basename])
 
+KPSE_DO_IF_WIN32([AC_CHECK_FUNCS([texlive_gs_init])])
+
 # We need enc, cmap, and sfd formats.
 # Introduced together with opentype format (Dec 2003).
 KPSE_CHECK_KPSE_FORMAT([opentype],