hholzgra Sat Jan 5 15:13:53 2002 EDT
Modified files:
/phpdoc configure.in
Log:
moved catalog file stuff to DocBook section
removed redundant PHP_BUILD_DATE declaration
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.94 phpdoc/configure.in:1.95
--- phpdoc/configure.in:1.94 Sat Jan 5 15:05:20 2002
+++ phpdoc/configure.in Sat Jan 5 15:13:53 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.94 2002/01/05 20:05:20 hholzgra Exp $
+dnl $Id: configure.in,v 1.95 2002/01/05 20:13:53 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -269,6 +269,42 @@
dnl }}}
+dnl {{{ check for catalog files
+
+dnl Do something smart to find catalog-files
+CATALOG=""
+
+dnl SuSE 6.2/6.3 need this
+if test -e /usr/share/sgml/CATALOG.docbk30
+then
+ CATALOG="$CATALOG -c /usr/share/sgml/CATALOG.docbk30"
+fi
+
+dnl For windows (and maybe *nix too?) users lacking catalog-files
+
+dnl jade catalog file
+# how about using JADEPATH? You should replace the last 4 chars ('jade') with catalog
+if test -e ../phpdoc-tools/jade/catalog
+then
+ CATALOG="$CATALOG -c ../phpdoc-tools/jade/catalog"
+fi
+
+dnl iso-ents catalog file
+if test -e ../phpdoc-tools/iso-entities/catalog
+then
+ CATALOG="$CATALOG -c ../phpdoc-tools/iso-entities/catalog"
+fi
+
+dnl dsssl catalog file
+if test -e ../phpdoc-tools/dsssl/docbook/catalog
+then
+ CATALOG="$CATALOG -c ../phpdoc-tools/dsssl/docbook/catalog"
+fi
+
+AC_SUBST(CATALOG)
+
+dnl }}}
+
dnl }}}
dnl {{{ check for additional docs and sources
@@ -289,9 +325,6 @@
])
AC_MSG_RESULT($PHP_SOURCE)
AC_SUBST(PHP_SOURCE)
-PHP_BUILD_DATE=`date`
-
-AC_SUBST(PHP_BUILD_DATE)
dnl }}}
@@ -335,19 +368,18 @@
AC_MSG_CHECKING(for language)
AC_ARG_WITH(lang,
-[ --with-lang=LANG Choose a language to work with],
-[
- if test "$withval" = "yes"; then
- PHP_BUILD_DATE=`date '+%Y-%m-%d'`
- AC_SUBST(PHP_BUILD_DATE)
+[ --with-lang=LANG Choose a language to work with],[
+ if test "$withval" = "yes"; then
+ PHP_BUILD_DATE=`date '+%Y-%m-%d'`
+ AC_SUBST(PHP_BUILD_DATE)
- LANG=en
- AC_MSG_RESULT([en (default)])
- else
- if test ! -d "$srcdir/$withval"; then
+ LANG=en
+ AC_MSG_RESULT([en (default)])
+ else
+ if test ! -d "$srcdir/$withval"; then
AC_MSG_RESULT()
AC_MSG_ERROR(Language \"$withval\" not supported!)
- fi
+ fi
dnl day/month/year
PHP_BUILD_DATE=`date '+%d-%m-%Y'`
@@ -508,42 +540,6 @@
AC_SUBST(SP_OPTIONS)
AC_SUBST(HTMLHELP_ENCODING)
-
-dnl }}}
-
-dnl {{{ check for catalog files
-
-dnl Do something smart to find catalog-files
-CATALOG=""
-
-dnl SuSE 6.2/6.3 need this
-if test -e /usr/share/sgml/CATALOG.docbk30
-then
- CATALOG="$CATALOG -c /usr/share/sgml/CATALOG.docbk30"
-fi
-
-dnl For windows (and maybe *nix too?) users lacking catalog-files
-
-dnl jade catalog file
-# how about using JADEPATH? You should replace the last 4 chars ('jade') with catalog
-if test -e ../phpdoc-tools/jade/catalog
-then
- CATALOG="$CATALOG -c ../phpdoc-tools/jade/catalog"
-fi
-
-dnl iso-ents catalog file
-if test -e ../phpdoc-tools/iso-entities/catalog
-then
- CATALOG="$CATALOG -c ../phpdoc-tools/iso-entities/catalog"
-fi
-
-dnl dsssl catalog file
-if test -e ../phpdoc-tools/dsssl/docbook/catalog
-then
- CATALOG="$CATALOG -c ../phpdoc-tools/dsssl/docbook/catalog"
-fi
-
-AC_SUBST(CATALOG)
dnl }}}
