X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=7ee05ceeed74842267430811ecaeb02399435c3c;hb=85d4a577410f0bffec48cd54d2a55e37a718d176;hp=ea5ccb527f189d94aae59c6953406a61a76304a3;hpb=59ec228b7cbadb992b27c435c8b2b4fdc4252556;p=rodin%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index ea5ccb5..7ee05ce 100755
--- a/configure.ac
+++ b/configure.ac
@@ -15,16 +15,17 @@ AM_INIT_AUTOMAKE([-Wall])
 
 AC_PROG_CC                 # C compiler
 AC_PROG_INSTALL            # Install
-AC_PROG_LIBTOOL            # Libtool
+LT_INIT                    # Libtool
+AM_GLIB_GNU_GETTEXT        # Use GLib gettext instead of standard
 IT_PROG_INTLTOOL([0.35.0]) # Intltool
 PKG_PROG_PKG_CONFIG        # pkg_config
+GTK_DOC_CHECK(1.9)         # Gtk-Doc
 
 ### INTERNATIONALIZATION ######################################################
 
 GETTEXT_PACKAGE=chimara
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
-AM_GLIB_GNU_GETTEXT
 
 ### CHECK FOR LIBRARIES #######################################################
 
@@ -46,37 +47,12 @@ AC_SUBST(TEST_CFLAGS)
 AC_SUBST(TEST_LIBS)
 
 ### GTK-DOC ###################################################################
-# Don't know what this does yet, it was autogenerated by Anjuta.
 
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
+# Allow gtkdocize to automatically copy the macro definition for
+# GTK_DOC_CHECK to the project.
+# AC_CONFIG_MACRO_DIR(m4)
 
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-# Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+### OUTPUT ####################################################################
 
 # Output platform-specific definitions to config.h
 AC_CONFIG_HEADERS([config.h])