summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-09-12 15:16:21 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-09-12 15:23:59 -0400
commit946cebf428ab1a917aaf3f086717fc317390cfd4 (patch)
tree3126e9e5f656146e0d29ce8e17e7e15b884b1b6b
parent7cf67b92cfdcbd4673b83960264b72a81d3ba16b (diff)
config: add AC_CONFIG_SRCDIR, layout and comment
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--configure.ac11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 1c8c814..5aab873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,15 @@ dnl USE OR PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xorg-docs], [1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([xorg-docs],
+ [1.5],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xorg-docs])
+AC_CONFIG_SRCDIR([Makefile.am])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -30,6 +37,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+XORG_CHECK_DOCBOOK
DEFAULT_X11DOCDIR=${datadir}/X11/doc
AC_ARG_WITH(x11docdir,
@@ -56,7 +64,6 @@ AM_CONDITIONAL(BUILD_TXTDOC, test "x$BUILD_TXTDOC" = xyes)
AM_CONDITIONAL(BUILD_PDFDOC, test "x$BUILD_PDFDOC" = xyes)
AM_CONDITIONAL(BUILD_PSDOC, test "x$BUILD_PSDOC" = xyes)
AM_CONDITIONAL(BUILD_HTMLDOC, test "x$BUILD_HTMLDOC" = xyes)
-XORG_CHECK_DOCBOOK
AC_OUTPUT([Makefile
man/Makefile