1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- configure.ac.orig 2015-03-30 08:21:24 UTC
+++ configure.ac
@@ -892,35 +892,6 @@ AC_SUBST(FTSRCDIR)
AC_SUBST(FT_CFLAGS)
AC_SUBST(FT_LIBS)
-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 $srcdir/jpeg/jpeglib.h; then
- AC_MSG_RESULT([jpeg])
- SHARE_LIBJPEG=0
- LIBJPEGDIR=$srcdir/jpeg
-elif test -f $srcdir/jpeg-6b/jpeglib.h; then
- AC_MSG_RESULT([jpeg-6b])
- SHARE_LIBJPEG=0
- LIBJPEGDIR=$srcdir/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
@@ -1607,7 +1578,7 @@ X_CFLAGS=""
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"
@@ -2074,7 +2045,10 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING(
DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
;;
*BSD)
- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
+ if test "x$X_DEVS" != x; then
+ INSTALL_SHARED="install-shared"
+ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
+ fi
DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
X11_DEVS=""
OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
@@ -2133,11 +2107,11 @@ if test "x$fontpath" = "x"; then
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
|
