diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-23 19:55:48 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-28 11:45:50 -0500 |
| commit | aaf318c99efcbc0d53f92059bc3bb74e08ab3c4c (patch) | |
| tree | 919e42e23711221238a847af53d410113f09ae7e | |
| parent | 3fa14f7d0efd20967b8b144a31ea677f9035001f (diff) | |
config: upgrade configure.ac
No functional change, applying standard statements and commenting.
http://wiki.x.org/wiki/NewModuleGuidelines
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | 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" ]) |