view src/gnu-linux-ghostscript-configure.patch @ 3653:3085b1b955dd

make native ghostscript build work; include ghostscript patches in dist file
author John W. Eaton <jwe@octave.org>
date Tue, 08 Jul 2014 10:08:07 -0400
parents
children
line wrap: on
line source

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)