From 061a6415261830282bd38413c631708e47d4cfef Mon Sep 17 00:00:00 2001 From: morcego Date: Tue, 5 Mar 2002 17:31:11 +0000 Subject: [PATCH] Search for docbook.dsl. Should solve portability problems for SuSe. --- GNUmakefile.in | 33 ++++-- configure | 273 ++++++++++++++++++++++++++++++++----------------- configure.in | 17 ++- 3 files changed, 220 insertions(+), 103 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index ee4c0992..04933670 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.7 2002/03/05 13:43:28 morcego Exp $ +# $Id: GNUmakefile.in,v 1.8 2002/03/05 14:07:42 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,10 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: GNUmakefile.in,v $ +# Revision 1.8 2002/03/05 14:07:42 morcego +# configure now detects rpm topdir, and change GNUmakefile acordingly +# (based on sugestion by Sarantis Paskalis) +# # Revision 1.7 2002/03/05 13:43:28 morcego # Checking for text browser, so redhat-dok can work. # @@ -258,7 +262,9 @@ TAR = tar MAKE = make LN = ln WDUMP = @WDUMP@ -dump -DB = jade -t sgml -ihtml -D.. -d ldp.dsl\#html +JADEBIN = @JADEBIN@ +DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html +DKPREFIX = @DKPREFIX@ # Program to do LF->CRLF # @@ -504,22 +510,22 @@ tarball-dist: # converts doc/source/*.sgml into html, text and man pages # ############################################################################# -dok: +dok: doc/source/ldpOK.dsl mkdir -p doc/text doc/man # user manual rm -rf doc/webserver/user-manual - cd doc/source && db2html -s ldp.dsl user-manual.sgml && mv user-manual ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual + cd doc/source && db2html -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver + cd doc/source && db2html -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual ## developer manual rm -rf doc/webserver/developer-manual - cd doc/source && db2html -s ldp.dsl developer-manual.sgml && mv developer-manual ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual + cd doc/source && db2html -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver + cd doc/source && db2html -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual ## faq rm -rf doc/webserver/faq - cd doc/source && db2html -s ldp.dsl faq.sgml && mv faq ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq + cd doc/source && db2html -s ldpOK.dsl faq.sgml && mv faq ../webserver + cd doc/source && db2html -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq -redhat-dok: +redhat-dok: doc/source/ldpOK.dsl mkdir -p doc/text doc/man doc/source/user-manual \ doc/source/developer-manual doc/source/faq ## user manual @@ -542,6 +548,13 @@ redhat-dok: cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \ tmp.html > ../text/faq.txt && rm -rf tmp.html faq +doc/source/ldpOK.dsl: + if [ "$(DKPREFIX)" != "none" ]; then \ + sed -e "s@/usr/share/sgml/docbook/dsssl-stylesheets@$(DKPREFIX)@g" doc/source/ldp.dsl > doc/source/ldpOK.dsl; \ + else \ + cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \ + fi + ############################################################################# # # Webserver diff --git a/configure b/configure index 8885a2bd..86e73c6f 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.31 +# From configure.in Revision: 1.32 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -1210,6 +1210,95 @@ if test $RPMBIN != false; then fi +for ac_prog in jade openjade +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1219: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_JADEBIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$JADEBIN"; then + ac_cv_prog_JADEBIN="$JADEBIN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_JADEBIN="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +JADEBIN="$ac_cv_prog_JADEBIN" +if test -n "$JADEBIN"; then + echo "$ac_t""$JADEBIN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$JADEBIN" && break +done +test -n "$JADEBIN" || JADEBIN="false" + + + +DKPREFIX=none + +ac_safe=`echo "/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl""... $ac_c" 1>&6 +echo "configure:1255: checking for /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" >&5 +if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } +else + if test -r /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl; then + eval "ac_cv_file_$ac_safe=yes" + else + eval "ac_cv_file_$ac_safe=no" + fi +fi +fi +if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + DKPREFIX=/usr/share/sgml/docbook/dsssl-stylesheets +else + echo "$ac_t""no" 1>&6 + +ac_safe=`echo "/usr/share/sgml/docbkdsl/html/docbook.dsl" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for /usr/share/sgml/docbkdsl/html/docbook.dsl""... $ac_c" 1>&6 +echo "configure:1277: checking for /usr/share/sgml/docbkdsl/html/docbook.dsl" >&5 +if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } +else + if test -r /usr/share/sgml/docbkdsl/html/docbook.dsl; then + eval "ac_cv_file_$ac_safe=yes" + else + eval "ac_cv_file_$ac_safe=no" + fi +fi +fi +if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + /usr/share/sgml/docbkdsl +else + echo "$ac_t""no" 1>&6 + +fi + +fi + + + old_CFLAGS_nospecial=$CFLAGS CFLAGS="$CFLAGS $SPECIAL_CFLAGS" @@ -1222,17 +1311,17 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:1226: checking for pthread.h" >&5 +echo "configure:1315: checking for pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1291,7 +1380,7 @@ fi echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1295: checking for gethostbyname in -lnsl" >&5 +echo "configure:1384: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1299,7 +1388,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1339,12 +1428,12 @@ fi echo $ac_n "checking for gethostbyaddr_r""... $ac_c" 1>&6 -echo "configure:1343: checking for gethostbyaddr_r" >&5 +echo "configure:1432: checking for gethostbyaddr_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyaddr_r=yes" else @@ -1383,9 +1472,9 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyaddr_r`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking signature of gethostbyaddr_r""... $ac_c" 1>&6 -echo "configure:1387: checking signature of gethostbyaddr_r" >&5 +echo "configure:1476: checking signature of gethostbyaddr_r" >&5 cat > conftest.$ac_ext < @@ -1399,7 +1488,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1414,7 +1503,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -1428,7 +1517,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1443,7 +1532,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -1458,7 +1547,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1492,12 +1581,12 @@ fi echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:1496: checking for gethostbyname_r" >&5 +echo "configure:1585: checking for gethostbyname_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -1536,9 +1625,9 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking signature of gethostbyname_r""... $ac_c" 1>&6 -echo "configure:1540: checking signature of gethostbyname_r" >&5 +echo "configure:1629: checking signature of gethostbyname_r" >&5 cat > conftest.$ac_ext < @@ -1552,7 +1641,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1567,7 +1656,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -1581,7 +1670,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1596,7 +1685,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -1610,7 +1699,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1644,12 +1733,12 @@ fi echo $ac_n "checking for gmtime_r""... $ac_c" 1>&6 -echo "configure:1648: checking for gmtime_r" >&5 +echo "configure:1737: checking for gmtime_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gmtime_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gmtime_r=yes" else @@ -1688,9 +1777,9 @@ if eval "test \"`echo '$ac_cv_func_'gmtime_r`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking signature of gmtime_r""... $ac_c" 1>&6 -echo "configure:1692: checking signature of gmtime_r" >&5 +echo "configure:1781: checking signature of gmtime_r" >&5 cat > conftest.$ac_ext < @@ -1703,7 +1792,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""ok" 1>&6 @@ -1731,12 +1820,12 @@ fi echo $ac_n "checking for localtime_r""... $ac_c" 1>&6 -echo "configure:1735: checking for localtime_r" >&5 +echo "configure:1824: checking for localtime_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_localtime_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_localtime_r=yes" else @@ -1775,9 +1864,9 @@ if eval "test \"`echo '$ac_cv_func_'localtime_r`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking signature of localtime_r""... $ac_c" 1>&6 -echo "configure:1779: checking signature of localtime_r" >&5 +echo "configure:1868: checking signature of localtime_r" >&5 cat > conftest.$ac_ext < @@ -1790,7 +1879,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""ok" 1>&6 @@ -1863,7 +1952,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1867: checking for executable suffix" >&5 +echo "configure:1956: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1873,7 +1962,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1894,13 +1983,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1898: checking for object suffix" >&5 +echo "configure:1987: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1918,12 +2007,12 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1922: checking for ANSI C header files" >&5 +echo "configure:2011: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1931,7 +2020,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1948,7 +2037,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1966,7 +2055,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1987,7 +2076,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1998,7 +2087,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2022,12 +2111,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2026: checking for working const" >&5 +echo "configure:2115: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2097,12 +2186,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2101: checking for size_t" >&5 +echo "configure:2190: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2130,7 +2219,7 @@ EOF fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2134: checking size of int" >&5 +echo "configure:2223: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2138,7 +2227,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -2149,7 +2238,7 @@ main() exit(0); } EOF -if { (eval echo configure:2153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2169,7 +2258,7 @@ EOF echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:2173: checking size of char *" >&5 +echo "configure:2262: checking size of char *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2177,7 +2266,7 @@ else ac_cv_sizeof_char_p=4 else cat > conftest.$ac_ext < main() @@ -2188,7 +2277,7 @@ main() exit(0); } EOF -if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char_p=`cat conftestval` else @@ -2208,7 +2297,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2212: checking size of long" >&5 +echo "configure:2301: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2216,7 +2305,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -2227,7 +2316,7 @@ main() exit(0); } EOF -if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2247,7 +2336,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2251: checking size of long long" >&5 +echo "configure:2340: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2255,7 +2344,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < main() @@ -2266,7 +2355,7 @@ main() exit(0); } EOF -if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2286,7 +2375,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:2290: checking size of size_t" >&5 +echo "configure:2379: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2294,7 +2383,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext < main() @@ -2305,7 +2394,7 @@ main() exit(0); } EOF -if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -2329,12 +2418,12 @@ EOF for ac_func in strerror bcopy memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_func" >&5 +echo "configure:2422: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2384,7 +2473,7 @@ done echo $ac_n "checking for pcre_compile in -lpcre""... $ac_c" 1>&6 -echo "configure:2388: checking for pcre_compile in -lpcre" >&5 +echo "configure:2477: checking for pcre_compile in -lpcre" >&5 ac_lib_var=`echo pcre'_'pcre_compile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2392,7 +2481,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcre $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2420,17 +2509,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "pcre.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pcre.h""... $ac_c" 1>&6 -echo "configure:2424: checking for pcre.h" >&5 +echo "configure:2513: checking for pcre.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2458,7 +2547,7 @@ have_pcre=no fi echo $ac_n "checking for regcomp in -lpcreposix""... $ac_c" 1>&6 -echo "configure:2462: checking for regcomp in -lpcreposix" >&5 +echo "configure:2551: checking for regcomp in -lpcreposix" >&5 ac_lib_var=`echo pcreposix'_'regcomp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2466,7 +2555,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcreposix -lpcre $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2494,17 +2583,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "pcreposix.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pcreposix.h""... $ac_c" 1>&6 -echo "configure:2498: checking for pcreposix.h" >&5 +echo "configure:2587: checking for pcreposix.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2532,7 +2621,7 @@ have_pcreposix=no fi echo $ac_n "checking for pcrs_compile in -lpcrs""... $ac_c" 1>&6 -echo "configure:2536: checking for pcrs_compile in -lpcrs" >&5 +echo "configure:2625: checking for pcrs_compile in -lpcrs" >&5 ac_lib_var=`echo pcrs'_'pcrs_compile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2540,7 +2629,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcrs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2568,17 +2657,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "pcrs.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pcrs.h""... $ac_c" 1>&6 -echo "configure:2572: checking for pcrs.h" >&5 +echo "configure:2661: checking for pcrs.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3058,6 +3147,8 @@ s%@WIN_ONLY@%$WIN_ONLY%g s%@WDUMP@%$WDUMP%g s%@RPMBIN@%$RPMBIN%g s%@RPM_BASE@%$RPM_BASE%g +s%@JADEBIN@%$JADEBIN%g +s%@DKPREFIX@%$DKPREFIX%g s%@PTHREAD_ONLY@%$PTHREAD_ONLY%g s%@SOCKET_LIB@%$SOCKET_LIB%g s%@AMIGAOS_ONLY@%$AMIGAOS_ONLY%g diff --git a/configure.in b/configure.in index f378cbff..51d1db13 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.31 2002/03/05 13:43:28 morcego Exp $ +dnl $Id: configure.in,v 1.32 2002/03/05 14:07:43 morcego Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge dnl IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,10 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.32 2002/03/05 14:07:43 morcego +dnl configure now detects rpm topdir, and change GNUmakefile acordingly +dnl (based on sugestion by Sarantis Paskalis) +dnl dnl Revision 1.31 2002/03/05 13:43:28 morcego dnl Checking for text browser, so redhat-dok can work. dnl @@ -240,7 +244,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.31 $) +AC_REVISION($Revision: 1.32 $) AC_INIT(jcc.c) AC_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -403,6 +407,15 @@ if test $RPMBIN != false; then fi AC_SUBST(RPM_BASE) +dnl Check for jade, so we can build the documentation +AC_CHECK_PROGS(JADEBIN,jade openjade,false) +AC_SUBST(JADEBIN) + +dnl Checking for the docbook.dsl stylesheet file +DKPREFIX=none +AC_CHECK_FILE(/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbook/dsssl-stylesheets,AC_CHECK_FILE(/usr/share/sgml/docbkdsl/html/docbook.dsl,/usr/share/sgml/docbkdsl)) +AC_SUBST(DKPREFIX) + dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS CFLAGS="$CFLAGS $SPECIAL_CFLAGS" -- 2.39.2