diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 14:40:28 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 14:40:35 -0700 |
| commit | eb2a237ac5ebc3e04e53658c6d30674419538eed (patch) | |
| tree | 3c0a962b5d47a192fbac98036902bd1155f7a273 | |
| parent | 08de40a2f599e2d66a31cf103109e1764b4f3e0d (diff) | |
config: Remove unnecessary calls from configure.ac
AC_PROG_CC, AC_PROG_SED & AC_PROG_INSTALL are provided by
XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 75c5a5b..2d700ca 100644 --- a/configure.ac +++ b/configure.ac @@ -26,34 +26,25 @@ AC_INIT(rstart,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -XORG_DEFAULT_OPTIONS - AC_ARG_VAR([RM],[Name of the rm command]) AC_ARG_VAR([LN],[Name of the ln command]) AC_CHECK_PROG([RM],[rm],[rm -f]) AC_CHECK_PROG([LN],[ln],[ln -s]) -AC_PROG_CC -AC_PROG_INSTALL -AC_PATH_PROG(SED, sed) -if [[ -z $SED ]] ; then - AC_MSG_ERROR([sed not found]) -fi AC_CHECK_PROGS(RSH,[remsh rsh rcmd]) XORG_PROG_RAWCPP # Checks for pkg-config packages PKG_CHECK_MODULES(RSTART, xproto) -AC_SUBST(RSTART_CFLAGS) -AC_SUBST(RSTART_LIBS) AC_ARG_WITH(default-user-path, [ --with-default-user-path=PATH ], [ DEFAULT_USER_PATH="$withval" ], |