diff options
| author | Eamon Walsh <efw@eamonwalsh.com> | 2010-08-02 19:48:51 -0400 |
|---|---|---|
| committer | Eamon Walsh <efw@eamonwalsh.com> | 2010-08-02 19:48:51 -0400 |
| commit | e85cbb0e7a426aa99d116610eeef6af413f31d3f (patch) | |
| tree | 1a3da35cc7b4c8c820496ff167f22121a6b67681 | |
| parent | 42a60b714059e332705b1b5db2bc9ae0b1551aab (diff) | |
Miscellaneous autotools warning fixes.
Signed-off-by: Eamon Walsh <efw@eamonwalsh.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 74f129a..9681ba0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS=src doc +ACLOCAL_AMFLAGS = -I m4 + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xpyb.pc @@ -9,4 +9,4 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +$srcdir/configure "$@" diff --git a/configure.ac b/configure.ac index bed3ee6..da345b0 100644 --- a/configure.ac +++ b/configure.ac @@ -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) |