GNOME.org
 

[libpeas] Update autotools configuration

commit 475b50745e3066ebb6f5214cbfa46027b3c78766
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Apr 23 17:57:27 2010 +0200

    Update autotools configuration
    
    New requirements:
    autoconf >= 2.63
    automake >= 1.11
    libtool >= 2.2.6
    gtk-doc >= 1.12
    
    https://bugzilla.gnome.org/show_bug.cgi?id=609208

 Makefile.am                |    2 +-
 autogen.sh                 |    5 ++-
 configure.ac               |   78 ++++++++++++++++++++-----------------------
 libpeas/Makefile.am        |    2 +-
 libpeasui/Makefile.am      |    2 +-
 loaders/c/Makefile.am      |    2 +-
 loaders/python/Makefile.am |    2 +-
 loaders/seed/Makefile.am   |    2 +-
 peas-demo/Makefile.am      |    2 +-
 9 files changed, 46 insertions(+), 51 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9e19f08..a5ed3af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-introspection
 
 SUBDIRS = libpeas libpeasui loaders data peas-demo po docs
diff --git a/autogen.sh b/autogen.sh
index 61d95fc..557f008 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,8 +15,9 @@ PKG_NAME="libpeas"
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common from GNOME Git (or from"
+    echo "your OS vendor's package manager)."
     exit 1
 }
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.8 REQUIRED_MACROS=python.m4 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+REQUIRED_MACROS=python.m4 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index a4dc89a..08e9d4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.62)
+AC_PREREQ([2.63])
 
 m4_define(peas_major_version,  2)
 m4_define(peas_minor_version, 29)
@@ -15,8 +15,10 @@ m4_define(peas_lt_current, [m4_eval(100 * peas_minor_version + peas_micro_versio
 m4_define(peas_lt_revision, [peas_interface_age])
 m4_define(peas_lt_age, [m4_eval(peas_binary_age - peas_interface_age)])
 
-AC_INIT(libpeas, peas_version, http://bugzilla.gnome.org/enter_bug.cgi?product=gedit)
-AC_CONFIG_SRCDIR(libpeas/peas-plugin.c)
+AC_INIT([libpeas],[peas_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gedit],[libpeas])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([libpeas/peas-plugin.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_DEFINE(PEAS_MAJOR_VERSION, peas_major_version, [Gedit Plugins Engine major version])
@@ -31,37 +33,32 @@ AC_SUBST(PEAS_VERSION, peas_version)
 PEAS_API_VERSION=2.20
 AC_SUBST(PEAS_API_VERSION)
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip -Wno-portability])
-
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_CONFIG_HEADERS(config.h)
-AC_DISABLE_STATIC
-
-IT_PROG_INTLTOOL([0.40.0])
-
-PKG_PROG_PKG_CONFIG
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip -Wno-portability])
+AM_MAINTAINER_MODE([enable])
 
-AC_PROG_LIBTOOL
+AM_SILENT_RULES([yes])
 
-GNOME_DOC_INIT
-GTK_DOC_CHECK([1.0])
+dnl ================================================================
+dnl Basic checks
+dnl ================================================================
 
-AC_ISC_POSIX
+# Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_MAKE_SET
 
-AC_SYS_LARGEFILE
+# Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
 
 AC_CHECK_FUNCS(fsync)
 AC_CHECK_FUNC(sigaction)
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
+PKG_PROG_PKG_CONFIG
 
-dnl check for native osx
+dnl ================================================================
+dnl Check for native OSX
+dnl ================================================================
 AC_MSG_CHECKING([for native Mac OS X])
 
 gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
@@ -84,6 +81,8 @@ dnl ================================================================
 dnl Gettext stuff.
 dnl ================================================================
 
+IT_PROG_INTLTOOL([0.40.0])
+
 GETTEXT_PACKAGE=libpeas
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -117,7 +116,7 @@ dnl ================================================================
 SEED_REQUIRED=2.28.0
 
 AC_ARG_ENABLE(seed,
-	      AC_HELP_STRING([--enable-seed],[Enable Seed support]),
+	      AS_HELP_STRING([--enable-seed],[Enable Seed support]),
 	      [enable_seed=$enableval],
 	      [enable_seed=auto])
 
@@ -243,7 +242,7 @@ if test "x$have_python" != "xno"; then
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $FLAGS"
 	AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
-	AC_TRY_COMPILE([], [], [compiler_has_option=yes], [compiler_has_option=no])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[compiler_has_option=yes],[compiler_has_option=no])
 	CFLAGS="$save_CFLAGS"
 	AC_MSG_RESULT($compiler_has_option)
 	if test $compiler_has_option = yes; then
@@ -259,8 +258,11 @@ fi
 
 AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"])
 
+dnl ================================================================
+dnl Documentation
+dnl ================================================================
 
-
+GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
 
 dnl ================================================================
 dnl Libtool
@@ -273,29 +275,21 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
+PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
+LOADER_LIBTOOL_FLAGS="-module -avoid-version -export-symbols-regex register_peas_plugin_loader"
+AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+AC_SUBST(LOADER_LIBTOOL_FLAGS)
+
 dnl ================================================================
 dnl Misc
 dnl ================================================================
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
-GNOME_COMPILE_WARNINGS(yes)
+GNOME_COMPILE_WARNINGS([maximum])
+# Use --enable-maintainer-mode to disabled deprecated symbols
+GNOME_MAINTAINER_MODE_DEFINES
 
-AC_ARG_ENABLE(deprecations,
-              [AS_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
-              [enable_deprecations=no])
-
-if test "x$enable_deprecations" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
-                              -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
-PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
-LOADER_LIBTOOL_FLAGS="-module -avoid-version -export-symbols-regex register_peas_plugin_loader"
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
-AC_SUBST(LOADER_LIBTOOL_FLAGS)
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am
index 90b76b4..1ffe430 100644
--- a/libpeas/Makefile.am
+++ b/libpeas/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES =								\
 	$(PEAS_CFLAGS)							\
 	$(IGE_MAC_CFLAGS)						\
 	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
+	$(DISABLE_DEPRECATED)						\
 	-DDATADIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"
 
diff --git a/libpeasui/Makefile.am b/libpeasui/Makefile.am
index 118b7b4..ae8a3f5 100644
--- a/libpeasui/Makefile.am
+++ b/libpeasui/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	$(PEAS_CFLAGS)			\
 	$(PEASUI_CFLAGS)		\
 	$(WARN_CFLAGS)			\
-	$(DISABLE_DEPRECATED_CFLAGS)
+	$(DISABLE_DEPRECATED)
 
 libpeasui_2_0_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
diff --git a/loaders/c/Makefile.am b/loaders/c/Makefile.am
index c3d41a9..5aac4e2 100644
--- a/loaders/c/Makefile.am
+++ b/loaders/c/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir)			\
 	$(PEAS_CFLAGS)			\
 	$(WARN_CFLAGS)			\
-	$(DISABLE_DEPRECATED_CFLAGS)
+	$(DISABLE_DEPRECATED)
 
 loader_LTLIBRARIES = libcloader.la
 
diff --git a/loaders/python/Makefile.am b/loaders/python/Makefile.am
index 94c4d7f..a8a7077 100644
--- a/loaders/python/Makefile.am
+++ b/loaders/python/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 	-I$(top_srcdir)			\
 	$(PEAS_CFLAGS)			\
 	$(WARN_CFLAGS)			\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(DISABLE_DEPRECATED)		\
 	$(PYGTK_CFLAGS)			\
 	$(PYTHON_CFLAGS)		\
 	-DPEAS_PYEXECDIR=\""$(pyexecdir)"\" \
diff --git a/loaders/seed/Makefile.am b/loaders/seed/Makefile.am
index 7202e5a..415f6ec 100644
--- a/loaders/seed/Makefile.am
+++ b/loaders/seed/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir)			\
 	$(PEAS_CFLAGS)			\
 	$(WARN_CFLAGS)			\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(DISABLE_DEPRECATED)		\
 	$(SEED_CFLAGS)
 
 loader_LTLIBRARIES = libseedloader.la
diff --git a/peas-demo/Makefile.am b/peas-demo/Makefile.am
index abf4d28..ea9d746 100644
--- a/peas-demo/Makefile.am
+++ b/peas-demo/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES =								\
 	$(PEAS_CFLAGS)							\
 	$(PEASUI_CFLAGS)						\
 	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)
+	$(DISABLE_DEPRECATED)
 
 peas_demo_SOURCES = \
 	peas-demo.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]