diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-02 22:01:47 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-02 22:01:47 -0800 |
| commit | 1756503394390624245e4e6caca41f4229c6aa0b (patch) | |
| tree | 90c9f44ede48eed797ed922a89562220c0d2a5f1 | |
| parent | 294f05abe020ec4fa3044d4520d657c7c123656b (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index a4ece27..fc79447 100644 --- a/configure.ac +++ b/configure.ac @@ -27,15 +27,17 @@ AC_INIT(lbxutil, 1.0.1, [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) AM_CONFIG_HEADER(config.h) +# 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) + # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Check for X PKG_CHECK_MODULES(LBXUTIL, xextproto xproto) @@ -43,15 +45,8 @@ PKG_CHECK_MODULES(LBXUTIL, xextproto xproto) AC_CHECK_LIB(z,deflate,[LBXUTIL_LIBS="${LBXUTIL_LIBS} -lz"], AC_MSG_ERROR([zlib is required to build liblbxutil])) -LBXUTIL_CFLAGS="$CWARNFLAGS $LBXUTIL_CFLAGS" AC_SUBST(LBXUTIL_CFLAGS) AC_SUBST(LBXUTIL_LIBS) - -# Check fixesext configuration, strip extra digits from package version to -# find the required protocol version - -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 2b480c0..a38c303 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = liblbxutil.la -AM_CFLAGS = @LBXUTIL_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS) noinst_PROGRAMS = mkg3states @@ -24,13 +24,13 @@ liblbxutil_la_SOURCES = \ nodist_liblbxutil_la_SOURCES = g3states.h -liblbxutil_la_LIBADD = @LBXUTIL_LIBS@ +liblbxutil_la_LIBADD = $(LBXUTIL_LIBS) $(srcdir)/image/dfaxg42d.c: g3states.h g3states.h: mkg3states -rm -f g3states.h - ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined |