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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
$NetBSD: patch-an,v 1.11 2010/05/21 10:05:20 sbd Exp $
The '$' while loops expand the variables as long as possible so that no
references to other variables occur. This is necessary because fontpath
may be "${exec_prefix}", which itself may be "${prefix}", and so on. I
don't know how many levels of indirection are possible, therefore the
loop.
I'm also sure that this is not the Right Way to fix it, but at least it
works.
--- config-scripts/cups-directories.m4.orig 2009-04-12 23:04:51.000000000 +0000
+++ config-scripts/cups-directories.m4
@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib
libdir="$exec_prefix/lib32"
;;
Linux*)
- if test -d /usr/lib64; then
+ if test -d /usr/lib64 && false; then
libdir="$exec_prefix/lib64"
fi
;;
@@ -297,7 +297,15 @@ AC_SUBST(CUPS_CACHEDIR)
# Data files
CUPS_DATADIR="$datadir/cups"
-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
+done=no
+while test $done = no; do
+ case "$CUPS_DATADIR" in
+ *'$'*) eval "CUPS_DATADIR=$CUPS_DATADIR";;
+ *) done=yes;;
+ esac
+done
+
+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR")
AC_SUBST(CUPS_DATADIR)
# Icon directory
@@ -306,7 +314,11 @@ AC_ARG_WITH(icondir, [ --with-icondir
if test "x$icondir" = x -a -d /usr/share/icons; then
ICONDIR="/usr/share/icons"
else
- ICONDIR="$icondir"
+ if test "x$icondir" = xno; then
+ ICONDIR=""
+ else
+ ICONDIR="$icondir"
+ fi
fi
AC_SUBST(ICONDIR)
@@ -317,7 +329,11 @@ AC_ARG_WITH(menudir, [ --with-menudir
if test "x$menudir" = x -a -d /usr/share/applications; then
MENUDIR="/usr/share/applications"
else
- MENUDIR="$menudir"
+ if test "x$menudir" = xno; then
+ MENUDIR=""
+ else
+ MENUDIR="$menudir"
+ fi
fi
AC_SUBST(MENUDIR)
@@ -332,7 +348,15 @@ else
CUPS_DOCROOT="$docdir"
fi
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
+done=no
+while test $done = no; do
+ case "$CUPS_DOCROOT" in
+ *'$'*) eval "CUPS_DOCROOT=$CUPS_DOCROOT";;
+ *) done=yes;;
+ esac
+done
+
+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT")
AC_SUBST(CUPS_DOCROOT)
# Fonts
@@ -344,8 +368,16 @@ else
CUPS_FONTPATH="$fontpath"
fi
-AC_SUBST(CUPS_FONTPATH)
+done=no
+while test $done = no; do
+ case "$CUPS_FONTPATH" in
+ *'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";;
+ *) done=yes;;
+ esac
+done
+
AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
+AC_SUBST(CUPS_FONTPATH)
# Locale data
if test "$localedir" = "\${datarootdir}/locale"; then
@@ -367,6 +399,14 @@ else
CUPS_LOCALEDIR="$localedir"
fi
+done=no
+while test $done = no; do
+ case "$CUPS_LOCALEDIR" in
+ *'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";;
+ *) done=yes;;
+ esac
+done
+
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
AC_SUBST(CUPS_LOCALEDIR)
@@ -375,7 +415,6 @@ AC_ARG_WITH(logdir, [ --with-logdir
if test x$logdir = x; then
CUPS_LOGDIR="$localstatedir/log/cups"
- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
else
CUPS_LOGDIR="$logdir"
fi
@@ -384,10 +423,13 @@ AC_SUBST(CUPS_LOGDIR)
# Longer-term spool data
CUPS_REQUESTS="$localstatedir/spool/cups"
-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
AC_SUBST(CUPS_REQUESTS)
# Server executables...
+AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="")
+
+if test x$serverbindir = x; then
case "$uname" in
*BSD* | Darwin*)
# *BSD and Darwin (MacOS X)
@@ -400,6 +442,10 @@ case "$uname" in
CUPS_SERVERBIN="$exec_prefix/lib/cups"
;;
esac
+else
+ INSTALL_SYSV=""
+ CUPS_SERVERBIN="$serverbindir"
+fi
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
AC_SUBST(CUPS_SERVERBIN)
@@ -407,7 +453,7 @@ AC_SUBST(INSTALL_SYSV)
# Configuration files
CUPS_SERVERROOT="$sysconfdir/cups"
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
AC_SUBST(CUPS_SERVERROOT)
# Transient run-time state
|
