diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-02 22:04:32 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-02 22:23:21 -0800 |
| commit | 4ec6d7bda0ad09c160ebe1621a5bbdc35010fbfd (patch) | |
| tree | 17e2274ca8dfe82415f1194b1ed1d2c588a67a44 | |
| parent | 0fde418f11ccbd88b6e7c43e84b7a719b7409cfd (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 | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index d0e0262..04c6922 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = lbxproxy -lbxproxy_CFLAGS = $(LBXPROXY_CFLAGS) -I$(top_srcdir)/include \ +AM_CFLAGS = $(CWARNFLAGS) + +AM_CPPFLAGS = $(LBXPROXY_CFLAGS) $(OS_CFLAGS) -I$(top_srcdir)/include \ -DDEF_ATOMS_FILE=\"$(libdir)/X11/lbxproxy/AtomControl\" \ -D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER @@ -117,7 +119,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog diff --git a/configure.ac b/configure.ac index 53b4702..34269a4 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,10 @@ AC_INIT(lbxproxy,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo 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) @@ -36,7 +37,7 @@ AC_PROG_CC AC_PROG_INSTALL AC_CANONICAL_HOST -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS case $host_os in linux*|gnu*|*-gnu) @@ -46,13 +47,23 @@ case $host_os in OS_CFLAGS= ;; esac +AC_SUBST(OS_CFLAGS) # Checks for pkg-config packages PKG_CHECK_MODULES(LBXPROXY, xtrans xext lbxutil x11 ice xproxymngproto bigreqsproto) -LBXPROXY_CFLAGS="$CWARNFLAGS $LBXPROXY_CFLAGS $OS_CFLAGS" AC_SUBST(LBXPROXY_CFLAGS) AC_SUBST(LBXPROXY_LIBS) +# Check which version of extension headers are installed +save_CFLAGS="${CFLAGS}" +CFLAGS="${CFLAGS} ${LBXPROXY_CFLAGS}" +AC_CHECK_HEADERS([X11/extensions/lbxproto.h X11/extensions/bigreqsproto.h], +[],[],[ +#include <X11/X.h> +#include <X11/Xproto.h> +]) +CFLAGS="${save_CFLAGS}" + # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS |