Permalink
Browse files

Miscellaneous autotools warning fixes.

Signed-off-by: Eamon Walsh <efw@eamonwalsh.com>
  • Loading branch information...
1 parent 42a60b7 commit e85cbb0e7a426aa99d116610eeef6af413f31d3f @sigalrm sigalrm committed Aug 2, 2010
Showing with 10 additions and 8 deletions.
  1. +2 −0 Makefile.am
  2. +1 −1 autogen.sh
  3. +7 −7 configure.ac
View
@@ -1,5 +1,7 @@
SUBDIRS=src doc
+ACLOCAL_AMFLAGS = -I m4
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xpyb.pc
View
@@ -9,4 +9,4 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
View
@@ -6,8 +6,14 @@ AC_INIT([xpyb],
1.2,
[xcb@lists.freedesktop.org])
AC_CONFIG_SRCDIR([xpyb.pc.in])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AC_CONFIG_MACRO_DIR([m4])
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_PROG_CC
+AC_CONFIG_HEADERS([src/config.h])
+
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_PATH_PYTHON([2.5])
AC_MSG_CHECKING([for python include dir])
PYTHON_INCLUDE=`$PYTHON -c "from distutils import sysconfig; \
@@ -20,12 +26,6 @@ fi
AC_MSG_RESULT([$PYTHON_INCLUDE])
AC_SUBST([PYTHON_INCLUDE])
-AC_CONFIG_HEADERS([src/config.h])
-
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
PKG_CHECK_MODULES(LIBXCB, xcb > 1.5)

0 comments on commit e85cbb0

Please sign in to comment.