# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1404828487 14400
# Node ID 3085b1b955dd3c7c73a1200c82e6f0b2180957ee
# Parent  7af3dec1ab503d0f6fe55f8c50837fdb04366b52
make native ghostscript build work; include ghostscript patches in dist file

diff -r 7af3dec1ab50 -r 3085b1b955dd dist-files.mk
--- a/dist-files.mk	Tue Jul 08 10:03:56 2014 -0400
+++ b/dist-files.mk	Tue Jul 08 10:08:07 2014 -0400
@@ -111,6 +111,9 @@
   geos-test.c \
   geos.mk \
   gettext.mk \
+  ghostscript-mingw-i686-arch.h \
+  ghostscript-mingw-i686-gconfig_.h \
+  ghostscript-mingw-i686-makefile \
   ghostscript.mk \
   giflib.mk \
   gl2ps-1-fixes.patch \
@@ -122,6 +125,7 @@
   glpk-1-fixes.patch \
   glpk.mk \
   gmp.mk \
+  gnu-linux-ghostscript-configure.patch \
   gnuplot-1-fixes.patch \
   gnuplot-2-win64.patch \
   gnuplot.mk \
diff -r 7af3dec1ab50 -r 3085b1b955dd src/ghostscript.mk
--- a/src/ghostscript.mk	Tue Jul 08 10:03:56 2014 -0400
+++ b/src/ghostscript.mk	Tue Jul 08 10:08:07 2014 -0400
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://downloads.ghostscript.com/public/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-gcc jpeg libpng jpeg tiff zlib
+$(PKG)_DEPS     := jpeg libpng jpeg tiff zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package ghostscript.' >&2;
@@ -19,6 +19,7 @@
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   define $(PKG)_BUILD
+    cd '$(1)' && autoreconf
     cd '$(1)' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
diff -r 7af3dec1ab50 -r 3085b1b955dd src/gnu-linux-ghostscript-configure.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gnu-linux-ghostscript-configure.patch	Tue Jul 08 10:08:07 2014 -0400
@@ -0,0 +1,55 @@
+diff -ur a/base/configure.ac b/base/configure.ac
+--- a/base/configure.ac	2013-02-14 02:58:13.000000000 -0500
++++ b/base/configure.ac	2014-07-08 09:44:59.470110783 -0400
+@@ -819,46 +819,11 @@
+ AC_SUBST(LIBPNGDIR)
+ #AC_SUBST(PNGDEVS)
+ 
+-WHICHLCMS=
+-
+-AC_ARG_WITH([lcms], AC_HELP_STRING([--with-lcms],
+-    [try to use LittleCMS 1.x instead of the default of LittleCMS 2.x]))
+-
+-if test x$with_lcms != xyes; then
+-  AC_MSG_CHECKING([for local lcms2 library source])
+-  LCMS2DIR=lcms2
+-  if test -f $LCMS2DIR/include/lcms2.h; then
+-        AC_MSG_RESULT([yes])
+-        SHARELCMS=0
+-        WHICHLCMS=lcms2
+-  else
+-    AC_MSG_RESULT([no])
+-    AC_MSG_CHECKING([for system lcms2 library])
+-    AC_CHECK_LIB(lcms2, cmsGetTransformOutputFormat, [
+-           AC_CHECK_HEADERS([lcms2.h], [LCMS2DIR="";SHARELCMS=1;WHICHLCMS=lcms2])
+-         ])
+-    if test x$WHICHLCMS = x; then
+-      AC_MSG_WARN([lcms2 not found, or too old])
+-    fi
+-  fi
+-fi
+-
+-if test x$WHICHLCMS = x; then
+-  AC_MSG_CHECKING([for local lcms library source])
+-  LCMSDIR=lcms
+-  SHARELCMS=0
+-  if test -f $LCMSDIR/include/lcms.h; then
+-        AC_MSG_RESULT([yes])
+-        SHARELCMS=0
+-        WHICHLCMS=lcms
+-  else
+-
+-    AC_MSG_ERROR([LittleCMS source not found!])
+-    #AC_CHECK_LIB(lcms, cmsCreateXYZProfile, [
+-    #          AC_CHECK_HEADERS([lcms.h], [SHARELCMS=1;LCMSDIR=""])
+-    #        ])
+-  fi
+-fi
++AC_MSG_NOTICE([unconditionally using installed lcms library])
++SHARELCMS=1
++WHICHLCMS=lcms2
++LCMSDIR=
++LCMS2DIR=
+ 
+ AC_SUBST(SHARELCMS)
+ AC_SUBST(WHICHLCMS)