diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:28:45 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:28:45 -0700 |
| commit | 38a9f63214c97900ec3e78d26481b4e34851478d (patch) | |
| tree | c97fce43fd6c5137d327129ef0650d0a382ba071 | |
| parent | ac956035a953743b6a0812ad5c3558175915b190 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 15 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 4cf902e..9f1b8ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ rstart_serverdir = $(libdir)/X11/rstart rstart_server_PROGRAMS = rstartd.real -rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ +AM_CFLAGS = $(CWARNFLAGS) $(RSTART_CFLAGS) \ -DSERVERNAME=\"rstart\" \ -DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\" @@ -55,21 +55,22 @@ configdir = $(libdir)/X11/rstart config_DATA = config config: config.cpp - $(RAWCPP) $(RAWCPPFLAGS) -DPACKAGEname=rstart -DLIBDIR=$(configdir) \ - -DENVPREFIX=RSTART < ${srcdir}/config.cpp | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) -DPACKAGEname=rstart \ + -DLIBDIR=$(configdir) -DENVPREFIX=RSTART \ + < ${srcdir}/config.cpp | $(CPP_SED_MAGIC) > $@ # wrapper scripts bin_SCRIPTS = rstart rstartd rstart: client.cpp - $(RAWCPP) $(RAWCPPFLAGS) -DRSHCMD=$(RSH) -DSERVERNAME=rstartd \ - < ${srcdir}/client.cpp | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) -DRSHCMD=$(RSH) \ + -DSERVERNAME=rstartd < ${srcdir}/client.cpp | $(CPP_SED_MAGIC) > $@ rstartd: server.cpp - $(RAWCPP) $(RAWCPPFLAGS) -DBINDIR=$(rstart_serverdir) \ - -DLIBDIR=$(configdir) -DSERVERNAME=rstartd < ${srcdir}/server.cpp | \ - $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) -DBINDIR=$(rstart_serverdir) \ + -DLIBDIR=$(configdir) -DSERVERNAME=rstartd < ${srcdir}/server.cpp | \ + $(CPP_SED_MAGIC) > $@ # man pages @@ -86,7 +87,7 @@ XORGRELSTRING = @PACKAGE_STRING@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ EXTRA_DIST = client.cpp server.cpp config.cpp $(appman_PRE) diff --git a/configure.ac b/configure.ac index 4377d7b..29db2ac 100644 --- a/configure.ac +++ b/configure.ac @@ -26,13 +26,14 @@ AC_INIT(rstart,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS AC_ARG_VAR([RM],[Name of the rm command]) AC_ARG_VAR([LN],[Name of the ln command]) @@ -51,14 +52,9 @@ XORG_PROG_RAWCPP # Checks for pkg-config packages PKG_CHECK_MODULES(RSTART, x11) -RSTART_CFLAGS="$CWARNFLAGS $RSTART_CFLAGS" AC_SUBST(RSTART_CFLAGS) AC_SUBST(RSTART_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - 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" ]) |