X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=configure.ac;h=a1bf39332f23abaa3082e6d116f11a151c6bc324;hb=refs%2Fheads%2Fautodoc;hp=ec261fdc07fc462a0243eac06faeccba5d33458f;hpb=201f5d2fb811e97b25aa4a0359c2ef614baee5c3;p=hvgrip.git

diff --git a/configure.ac b/configure.ac
index ec261fd..a1bf393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+# configure.ac -- Process this file with autoconf to produce configure.
 AC_PREREQ(2.52)
 
 AC_INIT([hvgrip], [3.4.0], [hugo@hugovil.com], [hvgrip],
@@ -5,10 +6,17 @@ AC_INIT([hvgrip], [3.4.0], [hugo@hugovil.com], [hvgrip],
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/main.c)
-AM_INIT_AUTOMAKE(check-news -Wall std-options)
-AM_SILENT_RULES([yes])
 
-AM_MAINTAINER_MODE
+dnl -Wno-extra-portability:
+dnl   To get rid of message:
+dnl     linking libraries using a non-POSIX archiver requires 'AM_PROG_AR'...
+dnl -Wall:
+dnl   Ask automake to turn on all warnings (not a gcc flag)
+AM_INIT_AUTOMAKE([no-define gnits dist-bzip2
+		  -Wall -Wno-extra-portability])
+AM_SILENT_RULES([yes])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.1])
 AM_CONFIG_HEADER(config.h:config.h.in)
 
 AC_ARG_ENABLE(shared_cdpar,
@@ -51,12 +59,6 @@ dnl check for curl
 AC_CHECK_HEADER(curl/curl.h, [], [AC_MSG_ERROR(libcurl headers are missing)])
 AC_CHECK_LIB(curl,curl_global_init, [LIBS="$LIBS `curl-config --libs`"], [AC_MSG_ERROR(curl libs are missing)])
 
-GETTEXT_PACKAGE=grip-2.2
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-ALL_LINGUAS="fr de zh_CN zh_HK zh_TW ja pt_BR ru es ca it be fi bg nl hu pl_PL"
-AM_GLIB_GNU_GETTEXT
-
 dnl do cdparanoia check
 if test "$enable_cdpar" = "yes"; then
   LIBS="$LIBS -lm"
@@ -131,18 +133,39 @@ fi
 AC_SUBST(ID3_LIBS)
 LIBS=$id3_libs_bak
 
+
+# Check if we can rebuild documentation
+##AX_CHECK_DOCBOOK
+
+##if test x"$XSLTPROC_WORKS" = xyes; then
+##  echo "  XSLTPROC_WORKS = YES"
+##fi
+
+dnl Check for xsltproc
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+
+dnl check for DocBook DTD and stylesheets in the local catalog.
+JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN], [DocBook XML DTD V4.3], [docbook_dtd=1], [docbook_dtd=0])
+
+JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl], [DocBook XSL Stylesheets], [docbook_stylesheet=1], [docbook_stylesheet=0])
+
+if test -n "$XSLTPROC" -a x"$docbook_dtd" = x1 -a x"$docbook_stylesheet" = x1; then
+   AM_CONDITIONAL(have_docbook, test -n "$XSLTPROC" -a x"$docbook_dtd" = x1 -a x"$docbook_stylesheet" = x1)
+fi
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(ac_aux_dir)
 
 AC_OUTPUT([
-Makefile
-grip.spec
-src/Makefile
-po/Makefile.in
-pixmaps/Makefile
-doc/Makefile
-doc/C/Makefile
-contrib/Makefile
+    Makefile
+    data/grip.spec
+    data/Makefile
+    src/Makefile
+    po/Makefile.in
+    pixmaps/Makefile
+    doc/Makefile
+    doc/images/Makefile
+    contrib/Makefile
 ])