Update autotools configuration

Use new libtool syntax and cleaning the code a bit
dev
Javier Jardón 14 years ago committed by Kristian Høgsberg
parent 0bfb126e59
commit 5b7e43ac56
  1. 2
      Makefile.am
  2. 17
      autogen.sh
  3. 23
      configure.ac

@ -1,3 +1,3 @@
SUBDIRS = wayland compositor clients data SUBDIRS = wayland compositor clients data
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

@ -1,12 +1,9 @@
#! /bin/sh #! /bin/sh
srcdir=`dirname $0` test -n "$srcdir" || srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=. test -n "$srcdir" || srcdir=.
(
ORIGDIR=`pwd` cd "$srcdir" &&
cd $srcdir autoreconf --force -v --install
) || exit
autoreconf --force -v --install || exit 1 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
cd $ORIGDIR || exit $?
$srcdir/configure "$@"

@ -1,11 +1,24 @@
AC_INIT(wayland, 0.1) AC_PREREQ([2.64])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_INIT([wayland],
AC_PROG_CC [0.1],
AC_PROG_LIBTOOL [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
AC_CONFIG_MACRO_DIR([m4]) [wayland],
[http://wayland.freedesktop.org/])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
# Check for programs
AC_PROG_CC
# Initialize libtool
LT_PREREQ([2.2])
LT_INIT
PKG_PROG_PKG_CONFIG() PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi]) PKG_CHECK_MODULES(FFI, [libffi])

Loading…
Cancel
Save