diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-22 19:39:08 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-22 19:39:08 -0700 |
| commit | 4abbf05633f16cae587f9f24881d18c22e43800d (patch) | |
| tree | d5391fe5787bb8f9b0da69940ee1251847274d62 | |
| parent | fb4778c1a6a114df03f3cefc87e747fab983355f (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index e3514e1..13a392b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = bitmap bmtoa atobm # bitmap -bitmap_CFLAGS = $(BITMAP_CFLAGS) +bitmap_CFLAGS = $(CWARNFLAGS) $(BITMAP_CFLAGS) bitmap_LDADD = $(BITMAP_LIBS) -lm bitmap_SOURCES = \ @@ -41,14 +41,14 @@ bitmap_SOURCES = \ # bmtoa -bmtoa_CFLAGS = $(BMTOA_CFLAGS) +bmtoa_CFLAGS = $(CWARNFLAGS) $(BMTOA_CFLAGS) bmtoa_LDADD = $(BMTOA_LIBS) bmtoa_SOURCES = \ bmtoa.c # atobm -atobm_CFLAGS = $(ATOBM_CFLAGS) +atobm_CFLAGS = $(CWARNFLAGS) $(ATOBM_CFLAGS) atobm_LDADD = $(ATOBM_LDADD) atobm_SOURCES = \ atobm.c diff --git a/configure.ac b/configure.ac index 7aca66d..1ea086d 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,9 @@ AC_INIT(bitmap,[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) @@ -36,20 +36,18 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS AC_CHECK_FUNC([mkstemp], AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.])) # bmtoa checks for packages PKG_CHECK_MODULES(BMTOA, x11 xmu) -BMTOA_CFLAGS="$CWARNFLAGS $BMTOA_CFLAGS" AC_SUBST(BMTOA_CFLAGS) AC_SUBST(BMTOA_LIBS) # atobm checks for packages PKG_CHECK_MODULES(ATOBM, x11) -ATOBM_CFLAGS="$CWARNFLAGS $ATOBM_CFLAGS" AC_SUBST(ATOBM_CFLAGS) AC_SUBST(ATOBM_LIBS) @@ -57,7 +55,7 @@ AC_SUBST(ATOBM_LIBS) PKG_CHECK_MODULES(BITMAP, xaw7) PKG_CHECK_MODULES(XBITMAPS, xbitmaps) -BITMAP_CFLAGS="$CWARNFLAGS $BITMAP_CFLAGS $XBITMAPS_CFLAGS" +BITMAP_CFLAGS="$BITMAP_CFLAGS $XBITMAPS_CFLAGS" BITMAP_LIBS="$BITMAP_LIBS $XBITMAPS_LIBS" AC_SUBST(BITMAP_CFLAGS) @@ -71,8 +69,4 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |