1 --- gtk-doc-0.4b1/gtk-doc.dsl.in.pubid Wed Dec 15 22:43:33 1999
2 +++ gtk-doc-0.4b1/gtk-doc.dsl.in Tue Jan 16 19:24:28 2001
4 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
5 -<!ENTITY dbstyle SYSTEM "@DSSSL_DIR@/html/docbook.dsl" CDATA DSSSL>
7 + PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
11 --- gtk-doc-0.4b1/configure.in.pubid Mon Oct 23 15:50:18 2000
12 +++ gtk-doc-0.4b1/configure.in Tue Jan 16 19:24:28 2001
15 AM_INIT_AUTOMAKE(gtk-doc, 0.4)
17 -AC_ARG_WITH(dsssl-dir, [ --with-dsssl-dir=PATH path to DocBook style sheets ])
22 -if test "x$with_dsssl_dir" = "x" ; then
23 - dirs="/usr/lib/sgml/stylesheets/nwalsh-modular /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh /usr/lib/dsssl/stylesheets/docbook /usr/share/sgml/docbkdsl"
25 - dirs=$with_dsssl_dir
28 AC_PATH_PROG(PERL, perl)
29 if test -z "$PERL"; then
30 AC_MSG_ERROR([perl not found])
33 -AC_MSG_CHECKING([for DocBook stylesheets])
37 - if test -f $i/html/docbook.dsl ; then
42 -if test "x$DSSSL_DIR" = x ; then
44 -*** Cannot find DocBook stylesheets in "$dirs".
45 -*** Perhaps you need to specify the --with-dsssl-dir=PATH option?])
52 dnl Only use -Wall if we have gcc
53 if test "x$GCC" = "xyes"; then
54 --- gtk-doc-0.4b1/configure.pubid Tue Jan 16 19:25:06 2001
55 +++ gtk-doc-0.4b1/configure Tue Jan 16 19:25:09 2001
58 ac_default_prefix=/usr/local
59 # Any additions from configure.in:
61 - --with-dsssl-dir=PATH path to DocBook style sheets "
63 # Initialize some variables set by options.
64 # The variables have the same names as the options, with
66 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
67 # ./install, which can be erroneously created by make from ./install.sh.
68 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
69 -echo "configure:559: checking for a BSD compatible install" >&5
70 +echo "configure:557: checking for a BSD compatible install" >&5
71 if test -z "$INSTALL"; then
72 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
73 echo $ac_n "(cached) $ac_c" 1>&6
75 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
77 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
78 -echo "configure:612: checking whether build environment is sane" >&5
79 +echo "configure:610: checking whether build environment is sane" >&5
82 echo timestamp > conftestfile
84 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
86 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
87 -echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5
88 +echo "configure:667: checking whether ${MAKE-make} sets \${MAKE}" >&5
89 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
90 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
91 echo $ac_n "(cached) $ac_c" 1>&6
94 missing_dir=`cd $ac_aux_dir && pwd`
95 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
96 -echo "configure:715: checking for working aclocal" >&5
97 +echo "configure:713: checking for working aclocal" >&5
98 # Run test in a subshell; some versions of sh will print an error if
99 # an executable is not found, even if stderr is redirected.
100 # Redirect stdin to placate older versions of autoconf. Sigh.
104 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
105 -echo "configure:728: checking for working autoconf" >&5
106 +echo "configure:726: checking for working autoconf" >&5
107 # Run test in a subshell; some versions of sh will print an error if
108 # an executable is not found, even if stderr is redirected.
109 # Redirect stdin to placate older versions of autoconf. Sigh.
113 echo $ac_n "checking for working automake""... $ac_c" 1>&6
114 -echo "configure:741: checking for working automake" >&5
115 +echo "configure:739: checking for working automake" >&5
116 # Run test in a subshell; some versions of sh will print an error if
117 # an executable is not found, even if stderr is redirected.
118 # Redirect stdin to placate older versions of autoconf. Sigh.
122 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
123 -echo "configure:754: checking for working autoheader" >&5
124 +echo "configure:752: checking for working autoheader" >&5
125 # Run test in a subshell; some versions of sh will print an error if
126 # an executable is not found, even if stderr is redirected.
127 # Redirect stdin to placate older versions of autoconf. Sigh.
131 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
132 -echo "configure:767: checking for working makeinfo" >&5
133 +echo "configure:765: checking for working makeinfo" >&5
134 # Run test in a subshell; some versions of sh will print an error if
135 # an executable is not found, even if stderr is redirected.
136 # Redirect stdin to placate older versions of autoconf. Sigh.
137 @@ -777,17 +775,10 @@
141 -# Check whether --with-dsssl-dir or --without-dsssl-dir was given.
142 -if test "${with_dsssl_dir+set}" = set; then
143 - withval="$with_dsssl_dir"
148 # Extract the first word of "gcc", so it can be a program name with args.
149 set dummy gcc; ac_word=$2
150 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
151 -echo "configure:791: checking for $ac_word" >&5
152 +echo "configure:782: checking for $ac_word" >&5
153 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
154 echo $ac_n "(cached) $ac_c" 1>&6
157 # Extract the first word of "cc", so it can be a program name with args.
158 set dummy cc; ac_word=$2
159 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
160 -echo "configure:821: checking for $ac_word" >&5
161 +echo "configure:812: checking for $ac_word" >&5
162 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
163 echo $ac_n "(cached) $ac_c" 1>&6
166 # Extract the first word of "cl", so it can be a program name with args.
167 set dummy cl; ac_word=$2
168 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
169 -echo "configure:872: checking for $ac_word" >&5
170 +echo "configure:863: checking for $ac_word" >&5
171 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
172 echo $ac_n "(cached) $ac_c" 1>&6
177 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
178 -echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
179 +echo "configure:895: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
182 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
183 @@ -911,12 +902,12 @@
185 cat > conftest.$ac_ext << EOF
187 -#line 915 "configure"
188 +#line 906 "configure"
189 #include "confdefs.h"
193 -if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
194 +if { (eval echo configure:911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
195 ac_cv_prog_cc_works=yes
196 # If we can't run a trivial program, we are probably using a cross compiler.
197 if (./conftest; exit) 2>/dev/null; then
198 @@ -942,12 +933,12 @@
199 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
201 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
202 -echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
203 +echo "configure:937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
204 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
205 cross_compiling=$ac_cv_prog_cc_cross
207 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
208 -echo "configure:951: checking whether we are using GNU C" >&5
209 +echo "configure:942: checking whether we are using GNU C" >&5
210 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
211 echo $ac_n "(cached) $ac_c" 1>&6
217 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
218 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
223 ac_save_CFLAGS="$CFLAGS"
225 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
226 -echo "configure:979: checking whether ${CC-cc} accepts -g" >&5
227 +echo "configure:970: checking whether ${CC-cc} accepts -g" >&5
228 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
229 echo $ac_n "(cached) $ac_c" 1>&6
234 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
235 -echo "configure:1011: checking for POSIXized ISC" >&5
236 +echo "configure:1002: checking for POSIXized ISC" >&5
237 if test -d /etc/conf/kconfig.d &&
238 grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
240 @@ -1030,7 +1021,7 @@
241 # Extract the first word of "gcc", so it can be a program name with args.
242 set dummy gcc; ac_word=$2
243 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
244 -echo "configure:1034: checking for $ac_word" >&5
245 +echo "configure:1025: checking for $ac_word" >&5
246 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
247 echo $ac_n "(cached) $ac_c" 1>&6
249 @@ -1060,7 +1051,7 @@
250 # Extract the first word of "cc", so it can be a program name with args.
251 set dummy cc; ac_word=$2
252 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
253 -echo "configure:1064: checking for $ac_word" >&5
254 +echo "configure:1055: checking for $ac_word" >&5
255 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
256 echo $ac_n "(cached) $ac_c" 1>&6
258 @@ -1111,7 +1102,7 @@
259 # Extract the first word of "cl", so it can be a program name with args.
260 set dummy cl; ac_word=$2
261 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
262 -echo "configure:1115: checking for $ac_word" >&5
263 +echo "configure:1106: checking for $ac_word" >&5
264 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
265 echo $ac_n "(cached) $ac_c" 1>&6
267 @@ -1143,7 +1134,7 @@
270 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
271 -echo "configure:1147: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
272 +echo "configure:1138: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
275 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
276 @@ -1154,12 +1145,12 @@
278 cat > conftest.$ac_ext << EOF
280 -#line 1158 "configure"
281 +#line 1149 "configure"
282 #include "confdefs.h"
286 -if { (eval echo configure:1163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
287 +if { (eval echo configure:1154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
288 ac_cv_prog_cc_works=yes
289 # If we can't run a trivial program, we are probably using a cross compiler.
290 if (./conftest; exit) 2>/dev/null; then
291 @@ -1185,12 +1176,12 @@
292 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
294 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
295 -echo "configure:1189: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
296 +echo "configure:1180: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
297 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
298 cross_compiling=$ac_cv_prog_cc_cross
300 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
301 -echo "configure:1194: checking whether we are using GNU C" >&5
302 +echo "configure:1185: checking whether we are using GNU C" >&5
303 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
304 echo $ac_n "(cached) $ac_c" 1>&6
306 @@ -1199,7 +1190,7 @@
310 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
311 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
315 @@ -1218,7 +1209,7 @@
316 ac_save_CFLAGS="$CFLAGS"
318 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
319 -echo "configure:1222: checking whether ${CC-cc} accepts -g" >&5
320 +echo "configure:1213: checking whether ${CC-cc} accepts -g" >&5
321 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
322 echo $ac_n "(cached) $ac_c" 1>&6
324 @@ -1250,16 +1241,10 @@
328 -if test "x$with_dsssl_dir" = "x" ; then
329 - dirs="/usr/lib/sgml/stylesheets/nwalsh-modular /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh /usr/lib/dsssl/stylesheets/docbook /usr/share/sgml/docbkdsl"
331 - dirs=$with_dsssl_dir
334 # Extract the first word of "perl", so it can be a program name with args.
335 set dummy perl; ac_word=$2
336 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
337 -echo "configure:1263: checking for $ac_word" >&5
338 +echo "configure:1248: checking for $ac_word" >&5
339 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
340 echo $ac_n "(cached) $ac_c" 1>&6
342 @@ -1295,26 +1280,6 @@
343 { echo "configure: error: perl not found" 1>&2; exit 1; }
346 -echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6
347 -echo "configure:1300: checking for DocBook stylesheets" >&5
351 - if test -f $i/html/docbook.dsl ; then
356 -if test "x$DSSSL_DIR" = x ; then
357 - { echo "configure: error:
358 -*** Cannot find DocBook stylesheets in "$dirs".
359 -*** Perhaps you need to specify the --with-dsssl-dir=PATH option?" 1>&2; exit 1; }
364 -echo "$ac_t""found" 1>&6
366 if test "x$GCC" = "xyes"; then
367 if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
368 CFLAGS="$CFLAGS -Wall"
369 @@ -1489,7 +1454,6 @@
370 s%@SET_MAKE@%$SET_MAKE%g
373 -s%@DSSSL_DIR@%$DSSSL_DIR%g