diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-09 23:28:11 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-09 23:28:11 -0700 |
| commit | c8e29f4a18041c7a649f701a7cfdd37080d7c6f6 (patch) | |
| tree | c6323aca9ad91e49c029f18b893fb0918202e690 | |
| parent | 7fc343e70202279fd3daa3adf789ca35b0ec8891 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 1e01b94..24f2091 100644 --- a/configure.ac +++ b/configure.ac @@ -12,19 +12,21 @@ 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 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) + 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(SM, [ice >= 1.0.5] xproto) -SM_CFLAGS="$CWARNFLAGS $SM_CFLAGS" AC_SUBST(SM_CFLAGS) AC_SUBST(SM_LIBS) @@ -53,9 +55,6 @@ AC_CHECK_FUNCS([uuid_create], [], [ AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile sm.pc]) diff --git a/src/Makefile.am b/src/Makefile.am index 41d074b..1098679 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES=libSM.la -AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS) +AM_CFLAGS= $(CWARNFLAGS) -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS) if WITH_LIBUUID AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID |