build: Update autotools configuration
Replace deprecated autoconf macros and use the new libtool syntax
This commit is contained in:
parent
a5ad7b6063
commit
fb7790f5b4
|
@ -5,7 +5,6 @@ srcdir=`dirname $0`
|
||||||
test -z "$srcdir" && srcdir=.
|
test -z "$srcdir" && srcdir=.
|
||||||
|
|
||||||
PKG_NAME="libnotify"
|
PKG_NAME="libnotify"
|
||||||
REQUIRED_AUTOMAKE_VERSION=1.9
|
|
||||||
|
|
||||||
(test -f $srcdir/configure.ac \
|
(test -f $srcdir/configure.ac \
|
||||||
&& test -d $srcdir/libnotify) || {
|
&& test -d $srcdir/libnotify) || {
|
||||||
|
|
37
configure.ac
37
configure.ac
|
@ -3,11 +3,16 @@ dnl Process this file with autoconf to create configure.
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
dnl # Initialize autoconf
|
dnl # Initialize autoconf
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
AC_INIT([libnotify],[0.7.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=libnotify],[libnotify])
|
AC_INIT([libnotify],
|
||||||
AC_PREREQ(2.50)
|
[0.7.3],
|
||||||
AC_CONFIG_SRCDIR(config.h.in)
|
[https://bugzilla.gnome.org/enter_bug.cgi?product=libnotify],
|
||||||
|
[libnotify])
|
||||||
|
AC_PREREQ([2.63])
|
||||||
|
|
||||||
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
|
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
dnl # Version information
|
dnl # Version information
|
||||||
|
@ -61,22 +66,13 @@ AC_SUBST(LT_AGE)
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
dnl # Initialize automake
|
dnl # Initialize automake
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
VERSION=$LIBNOTIFY_VERSION
|
|
||||||
PACKAGE=libnotify
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2])
|
AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2])
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
dnl ################################################################
|
|
||||||
dnl # Specify a header configuration file
|
|
||||||
dnl ################################################################
|
|
||||||
AM_CONFIG_HEADER(config.h)
|
|
||||||
|
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
dnl # Check for some standard stuff.
|
dnl # Check for some standard stuff.
|
||||||
dnl ################################################################
|
dnl ################################################################
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
#AC_ARG_PROGRAM
|
|
||||||
AC_PROG_CPP
|
AC_PROG_CPP
|
||||||
AC_PROG_MAKE_SET
|
AC_PROG_MAKE_SET
|
||||||
AC_PROG_LN_S
|
AC_PROG_LN_S
|
||||||
|
@ -86,21 +82,18 @@ AC_C_CONST
|
||||||
AC_TYPE_SIZE_T
|
AC_TYPE_SIZE_T
|
||||||
AC_EXEEXT
|
AC_EXEEXT
|
||||||
|
|
||||||
AM_PROG_LIBTOOL
|
# Initialize libtool
|
||||||
|
LT_PREREQ([2.2])
|
||||||
|
LT_INIT
|
||||||
|
|
||||||
REQ_GTK_VERSION=2.90
|
REQ_GTK_VERSION=2.90
|
||||||
REQ_GLIB_VERSION=2.26.0
|
REQ_GLIB_VERSION=2.26.0
|
||||||
|
|
||||||
pkg_modules="gdk-pixbuf-2.0 glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GLIB_VERSION"
|
pkg_modules="gdk-pixbuf-2.0 glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GLIB_VERSION"
|
||||||
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
|
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
|
||||||
AC_SUBST(PACKAGE_LIBS)
|
|
||||||
AC_SUBST(PACKAGE_CFLAGS)
|
|
||||||
AC_SUBST(pkg_modules)
|
|
||||||
|
|
||||||
tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
|
tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
|
||||||
PKG_CHECK_MODULES(TESTS, [$tests_modules])
|
PKG_CHECK_MODULES(TESTS, [$tests_modules])
|
||||||
AC_SUBST(TESTS_LIBS)
|
|
||||||
AC_SUBST(TESTS_CFLAGS)
|
|
||||||
|
|
||||||
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
|
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
|
||||||
AC_SUBST(GLIB_GENMARSHAL)
|
AC_SUBST(GLIB_GENMARSHAL)
|
||||||
|
@ -117,7 +110,7 @@ dnl - DocBook Documentation
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
AC_ARG_ENABLE(docbook-docs,
|
AC_ARG_ENABLE(docbook-docs,
|
||||||
[AC_HELP_STRING([--enable-docbook-docs],
|
[AS_HELP_STRING([--enable-docbook-docs],
|
||||||
[build documentation (requires xmlto)])],
|
[build documentation (requires xmlto)])],
|
||||||
enable_docbook_docs=$enableval,enable_docbook_docs=no)
|
enable_docbook_docs=$enableval,enable_docbook_docs=no)
|
||||||
AC_PATH_PROG(XMLTO, xmlto, no)
|
AC_PATH_PROG(XMLTO, xmlto, no)
|
||||||
|
@ -172,9 +165,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
|
||||||
SAVE_CFLAGS="$CFLAGS"
|
SAVE_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $option"
|
CFLAGS="$CFLAGS $option"
|
||||||
AC_MSG_CHECKING([whether gcc understands $option])
|
AC_MSG_CHECKING([whether gcc understands $option])
|
||||||
AC_TRY_COMPILE([], [],
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||||||
has_option=yes,
|
[has_option=yes],
|
||||||
has_option=no,)
|
[has_option=no])
|
||||||
if test $has_option = no; then
|
if test $has_option = no; then
|
||||||
CFLAGS="$SAVE_CFLAGS"
|
CFLAGS="$SAVE_CFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue