diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | gnome-doc-utils.m4 | 23 |
5 files changed, 48 insertions, 4 deletions
@@ -1,3 +1,13 @@ +2004-03-08 Shaun McCance <shaunm@gnome.org> + + * Makefile.am: + * autogen.sh: + * configure.in: + * gnome-doc-utils.m4: + - Added xslt to SUBDIRS + - Added gnome-doc-utils.m4 + - Added ACLOCAL_FLAGS to bootstrap off of local gnome-doc-utils.m4 + 2004-03-04 Shaun McCance <shaunm@gnome.org> * configure.in: diff --git a/Makefile.am b/Makefile.am index f72c46a..08b92c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,14 @@ -SUBDIRS = po +SUBDIRS = po xslt + +aclocaldir = $(datadir)/aclocal +aclocal_DATA = gnome-doc-utils.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-doc-utils.pc EXTRA_DIST = \ + $(aclocal_DATA) \ + $(pkgconfig_DATA) \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in \ - intltool-modules/XML/Parser/Style/OrigTree.pm - + intltool-update.in @@ -18,4 +18,9 @@ which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME CVS" exit 1 } + +# Bootstrap off the local gnome-doc-utils.m4 +ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS" +export ACLOCAL_FLAGS + USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.in b/configure.in index 04a2267..210431d 100644 --- a/configure.in +++ b/configure.in @@ -4,6 +4,8 @@ AM_INIT_AUTOMAKE(gnome-doc-utils, 0.1) AC_PROG_INTLTOOL AM_GLIB_GNU_GETTEXT +GNOME_DOC_INIT + ALL_LINGUAS="" AC_OUTPUT([ @@ -11,4 +13,5 @@ Makefile gnome-doc-utils.pc po/Makefile.in xslt/Makefile +xslt/gettext/Makefile ]) diff --git a/gnome-doc-utils.m4 b/gnome-doc-utils.m4 new file mode 100644 index 0000000..fb75825 --- /dev/null +++ b/gnome-doc-utils.m4 @@ -0,0 +1,23 @@ +dnl GNOME_DOC_INIT + +AC_DEFUN([GNOME_DOC_INIT], +[ +AC_ARG_WITH(docdir, + AC_HELP_STRING([--with-docdir=DIR], [path to simple docs]),, + [with_docdir='${datadir}/doc']) +DOC_DIR="$with_docdir" +AC_SUBST(DOC_DIR) + +AC_ARG_WITH(helpdir, + AC_HELP_STRING([--with-helpdir=DIR], [path to help docs]),, + [with_helpdir='${datadir}/help']) +HELP_DIR="$with_helpdir" +AC_SUBST(HELP_DIR) + +AC_ARG_WITH(omfdir, + AC_HELP_STRING([--with-omfdir=DIR], [path to OMF files]),, + [with_omfdir='${datadir}/omf']) +OMF_DIR="$with_omfdir" +AC_SUBST(OMF_DIR) + +]) |