diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 20:54:04 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 20:54:04 -0700 |
| commit | 1a1c157c7abccc03a37c26e63ad923fd7dfecc5c (patch) | |
| tree | 69e15fbb7e7004f8614539f0acf2270fc3237229 | |
| parent | 8b1af8f1ef0d7cce970a05fe36b7e8e63aa18068 (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 be6680f..b2367b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xclock -AM_CFLAGS = $(XCLOCK_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCLOCK_CFLAGS) xclock_LDADD = $(XCLOCK_LIBS) xclock_SOURCES = \ diff --git a/configure.ac b/configure.ac index c760cb5..3c7bd1c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,16 +26,16 @@ AC_INIT(xclock,[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: 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 AC_CHECK_FUNCS([strlcpy getpid]) @@ -45,7 +45,7 @@ AC_SEARCH_LIBS([iconv], [iconv], dnl Required dependencies PKG_CHECK_MODULES(XCLOCK_X11, x11) PKG_CHECK_MODULES(XAW, xaw7) -XCLOCK_CFLAGS="$CWARNFLAGS $XCLOCK_X11_CFLAGS $XAW_CFLAGS" +XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS" XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS" dnl Optional dependencies @@ -78,8 +78,4 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |