diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-10 22:25:32 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-10 22:32:01 -0800 |
| commit | fab6c10f50649961059607ff6a43981d72e28c72 (patch) | |
| tree | 97193a5fc971cb8469c84eb7bc46a2e169bebcac | |
| parent | 90877de1d293d9f0ec47e588a518327b43536c6e (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 7 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index c8d5a04..b7e2fd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ AM_YFLAGS = -d bin_PROGRAMS = xgc -AM_CFLAGS = $(XGC_CFLAGS) -D_BSD_SOURCE +AM_CFLAGS = $(CWARNFLAGS) $(XGC_CFLAGS) -D_BSD_SOURCE xgc_LDADD = $(XGC_LIBS) -lm xgc_SOURCES = \ @@ -99,7 +99,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES += ChangeLog diff --git a/configure.ac b/configure.ac index 6a67144..34d316b 100644 --- a/configure.ac +++ b/configure.ac @@ -25,14 +25,13 @@ AC_PREREQ([2.57]) AC_INIT(xgc,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgc) 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) - AM_CONFIG_HEADER(config.h) -XORG_CWARNFLAGS +# 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) +XORG_DEFAULT_OPTIONS AC_PROG_LEX AC_PROG_YACC @@ -40,7 +39,6 @@ AC_PROG_CC AC_PROG_INSTALL PKG_CHECK_MODULES(XGC, xaw7) -XGC_CFLAGS="$CWARNFLAGS $XGC_CFLAGS" AC_SUBST(XGC_CFLAGS) AC_SUBST(XGC_LIBS) @@ -52,8 +50,4 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |