diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-22 20:05:04 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-22 20:05:04 -0700 |
| commit | e919068b70411167e3f239ad32d1fd4ad2a0c10d (patch) | |
| tree | db3da67ea976e6c6b0975ac833fea181f16b8b86 | |
| parent | 086d2257cc5ad59f1e2aa7362a912e4855edc4be (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 76158dd..ac6c6da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = editres -AM_CFLAGS = $(EDITRES_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(EDITRES_CFLAGS) editres_LDADD = $(EDITRES_LIBS) editres_SOURCES = \ diff --git a/configure.ac b/configure.ac index f5a9c20..f41574b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,21 +26,21 @@ AC_INIT(editres,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor 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: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XAW, xaw7) PKG_CHECK_MODULES(EDITRES, x11 xt xmu) -EDITRES_CFLAGS="$CWARNFLAGS $EDITRES_CFLAGS $XAW_CFLAGS" +EDITRES_CFLAGS="$EDITRES_CFLAGS $XAW_CFLAGS" EDITRES_LIBS="$EDITRES_LIBS $XAW_LIBS" AC_SUBST(EDITRES_CFLAGS) AC_SUBST(EDITRES_LIBS) @@ -53,8 +53,4 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |