blob: 14d40344ab49ac102a96333d9e9094a9385d8e1f (
plain) (
blame)
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
|
--- configure.ac.orig 2015-03-30 08:21:24 UTC
+++ configure.ac
@@ -1607,7 +1607,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 +2074,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 +2136,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
|
