diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-23 17:49:27 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-23 17:49:27 -0700 |
| commit | 5b31bee92b56147e2c17d19e46e09145d765fdb4 (patch) | |
| tree | 0313aeb4421247442c7c5e61787910230c1d4153 | |
| parent | fef063d82e332b96bcb12ce41abefce868821577 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 48e2829..78c292b 100644 --- a/configure.ac +++ b/configure.ac @@ -15,20 +15,19 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT -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, XORG_WITH_LINT +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]) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) -XMU_CFLAGS="$CWARNFLAGS $XMU_CFLAGS" AC_SUBST(XMU_CFLAGS) AC_SUBST(XMU_LIBS) @@ -63,9 +62,6 @@ XORG_LINT_LIBRARY([Xmu]) LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/` AC_SUBST(LINTLIBUU) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile include/Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 0f19c5e..ad5b55d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/include/X11/Xmu \ $(BITMAP_DEFINES) -D_BSD_SOURCE -AM_CFLAGS = $(XMU_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS) libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined |