[PATCH app-rstart 15/15] config: upgrade configure.ac
Gaetan Nadon
memsize at videotron.ca
Thu Jan 27 12:58:51 PST 2011
No functional change, applying standard statements and commenting.
http://wiki.x.org/wiki/NewModuleGuidelines
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 91ef8fa..bdf67da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,9 +21,15 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([rstart], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [rstart])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS(config.h)
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,22 +39,23 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_CONFIG_HEADERS([config.h])
-
+# Checks for programs.
AC_CHECK_PROGS(RSH,[remsh rsh rcmd])
AC_PROG_LN_S
# Define the root directory for client/server/config
AC_SUBST([rstartdir],[$libdir/X11/rstart])
-# Checks for pkg-config packages
+# Obtain compiler options from depedencies
PKG_CHECK_MODULES(RSTART, xproto)
+# Define a configure option for an alternate user path
AC_ARG_WITH(default-user-path, [ --with-default-user-path=PATH ],
[ DEFAULT_USER_PATH="$withval" ],
[ DEFAULT_USER_PATH="/bin:/usr/bin:${prefix}/bin:/usr/ucb:/usr/gnu/bin:/usr/local/bin" ])
AC_SUBST(DEFAULT_USER_PATH)
+# Define a configure option for an alternate man pages path
AC_ARG_WITH(default-man-path, [ --with-default-man-path=PATH ],
[ DEFAULT_X_MANPATH="$withval" ],
[ DEFAULT_X_MANPATH="${prefix}/man:/usr/share/man:/usr/man" ])
--
1.6.0.4
More information about the xorg-devel
mailing list