diff options
Diffstat (limited to 'print/ghostscript8-x11/files/patch-base-configure.ac')
| -rw-r--r-- | print/ghostscript8-x11/files/patch-base-configure.ac | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/print/ghostscript8-x11/files/patch-base-configure.ac b/print/ghostscript8-x11/files/patch-base-configure.ac new file mode 100644 index 000000000000..cf4085dfeebb --- /dev/null +++ b/print/ghostscript8-x11/files/patch-base-configure.ac @@ -0,0 +1,94 @@ +--- base/configure.ac.orig 2009-11-24 17:36:27.000000000 +0900 ++++ base/configure.ac 2015-08-21 20:57:47.140818000 +0900 +@@ -322,35 +322,6 @@ + + AC_CHECK_LIB(dl, dlopen) + +-AC_MSG_CHECKING([for local jpeg library source]) +-dnl At present, we give the local source priority over the shared +-dnl build, so that the D_MAX_BLOCKS_IN_MCU patch will be applied. +-dnl A more sophisticated approach would be to test the shared lib +-dnl to see whether it has already been patched. +-LIBJPEGDIR=src +-if test -f jpeg/jpeglib.h; then +- AC_MSG_RESULT([jpeg]) +- SHARE_LIBJPEG=0 +- LIBJPEGDIR=jpeg +-elif test -f jpeg-6b/jpeglib.h; then +- AC_MSG_RESULT([jpeg-6b]) +- SHARE_LIBJPEG=0 +- LIBJPEGDIR=jpeg-6b +-else +- AC_MSG_RESULT([no]) +- AC_CHECK_LIB(jpeg, jpeg_set_defaults, [ +- AC_CHECK_HEADERS([jpeglib.h], [SHARE_LIBJPEG=1]) +- ]) +-fi +-if test -z "$SHARE_LIBJPEG"; then +- AC_MSG_ERROR([I wasn't able to find a copy +- of the jpeg library. This is required for compiling +- ghostscript. Please download a copy of the source, +- e.g. from http://www.ijg.org/, unpack it at the +- top level of the gs source tree, and rename +- the directory to 'jpeg'. +- ]) +-fi + AC_SUBST(SHARE_LIBJPEG) + AC_SUBST(LIBJPEGDIR) + dnl check for the internal jpeg memory header +@@ -402,7 +373,7 @@ + PNGDEVS="$PNGDEVS_ALL" + else + AC_MSG_RESULT([no]) +- AC_CHECK_LIB(png, png_check_sig, [ ++ AC_CHECK_LIB(png, png_sig_cmp, [ + AC_CHECK_HEADERS(png.h, [ + SHARE_LIBPNG=1 + PNGDEVS="$PNGDEVS_ALL" +@@ -434,7 +405,7 @@ + AC_CHECK_LIB(tiff, TIFFOpen, + [AC_CHECK_HEADERS(tiff.h, [HAVE_SYSTEM_LIBTIFF=1;SHARE_LIBTIFF=1])], + [], [-ljpeg]) +- if test -z $LOCAL_LIBTIFF_VERSION && test "x$HAVE_SYSTEM_LIBTIFF" == x; then ++ if test -z $LOCAL_LIBTIFF_VERSION && test "x$HAVE_SYSTEM_LIBTIFF" = x; then + AC_MSG_NOTICE([Could not find a copy of libtiff on your system. + Disabling tiff output devices.]) + else +@@ -758,7 +729,7 @@ + X_DEVS="" + X_LIBS="" + +-if test x$no_x != xyes; then ++if test x$with_x != xno; then + if test "$x_libraries" = "/usr/lib"; then + echo "Ignoring X library directory \"$x_libraries\" requested by configure." + x_libraries="NONE" +@@ -1063,7 +1034,12 @@ + ;; + *BSD) + DYNAMIC_CFLAGS="-fPIC" +- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" ++ if test "x$X_DEVS" != x; then ++ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" ++ INSTALL_SHARED="install-shared" ++ else ++ DYNAMIC_DEVS="" ++ fi + DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" + DYNAMIC_LDFLAGS="-fPIC -shared" + DYNAMIC_LIBS="" +@@ -1119,11 +1095,11 @@ + fontpath="${fontpath}:$datadir/fonts/default/TrueType" + + # These font directories are used by IRIX... +- fontpath="${fontpath}:/usr/lib/DPS/outline/base" ++ # fontpath="${fontpath}:/usr/lib/DPS/outline/base" + + # These font directories are used by Solaris... +- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" +- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" ++ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" ++ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" + + # This font directory is used by CUPS... + if test "x$CUPSCONFIG" != x; then |