diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-11-06 01:55:27 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-11-06 21:04:03 -0400 |
| commit | 5b7e43ac5697b34725f8a8d7d06f529d80c68f66 (patch) | |
| tree | b0a23b9f0b458f9ba9a34dcb15d322800afd9aab | |
| parent | Add /wayland so we pick up generated header files (diff) | |
| download | wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.tar wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.tar.gz wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.tar.bz2 wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.tar.lz wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.tar.xz wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.tar.zst wayland-5b7e43ac5697b34725f8a8d7d06f529d80c68f66.zip | |
Update autotools configuration
Use new libtool syntax and cleaning the code a bit
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 17 | ||||
| -rw-r--r-- | configure.ac | 23 |
3 files changed, 26 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 46529e5..03d15db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = wayland compositor clients data -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} @@ -1,12 +1,9 @@ #! /bin/sh -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf --force -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure "$@" +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. +( + cd "$srcdir" && + autoreconf --force -v --install +) || exit +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/configure.ac b/configure.ac index f57e2bd..5568218 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,24 @@ -AC_INIT(wayland, 0.1) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AC_PROG_CC -AC_PROG_LIBTOOL -AC_CONFIG_MACRO_DIR([m4]) +AC_PREREQ([2.64]) +AC_INIT([wayland], + [0.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland], + [wayland], + [http://wayland.freedesktop.org/]) + AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) + +AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2]) + AM_SILENT_RULES([yes]) +# Check for programs +AC_PROG_CC + +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT + PKG_PROG_PKG_CONFIG() PKG_CHECK_MODULES(FFI, [libffi]) |