[gnome-web-photo] build: Modernize build system a bit



commit f0406d6636de2f595a0c0381a0d59fa87e2127f9
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Jun 14 15:04:36 2011 +0200

    build: Modernize build system a bit
    
    Stop using GNOME_COMMON_INIT as it is deprecated.
    Use the tar-ustar option for AM_INIT_AUTOMAKE for better tarballs.
    Require intltool 0.40.6 to avoid various bugs.
    Do not use libtool as there's nothing needing it.
    Do not use AC_ISC_POSIX, AC_HEADER_STDC, AM_PROG_CC_C_O as they
    shouldn't be needed on modern systems.
    Do not use AC_C_BIGENDIAN as we do not need it.
    Do not use GNOME_DEBUG_CHECK as we do not need it.
    Use GNOME_MAINTAINER_MODE_DEFINES instead of defining all
    *_DISABLE_DEPRECATED flags ourselves.
    Drop manual check for additional compiler flags.

 configure.ac |   54 +++++-------------------------------------------------
 1 files changed, 5 insertions(+), 49 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b784374..73d47e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,50 +18,33 @@
 
 AC_INIT([GNOME Web Photo],[0.10.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-web-photo],[gnome-web-photo])
 
-GNOME_COMMON_INIT
-
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip tar-ustar])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.6])
 
 GLIB_REQUIRED=2.14.0
 GTK2_REQUIRED=2.20.0
 GTK3_REQUIRED=2.99.3
 WEBKIT_REQUIRED=1.1.23
 
-AC_ENABLE_SHARED([yes])
-AC_ENABLE_STATIC([no])
-
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
-
-AC_ISC_POSIX
-
 AC_PROG_LN_S
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-AC_C_BIGENDIAN
 
-GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
 
-MORE_WARN_FLAGS=
 DEPRECATION_FLAGS=
 
 if test "x$enable_maintainer_mode" = "xyes"; then
-	AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
-	enable_debug=yes
-        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
+        DEPRECATION_FLAGS="$DISABLE_DEPRECATED"
 fi
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
@@ -116,41 +99,14 @@ fi
 
 AM_GCONF_SOURCE_2
 
-# ******************
-# Portability checks
-# ******************
-
-if test "x$enable_maintainer_mode" = "xyes"; then
-
-	AC_LANG_PUSH([C])
-	FLAGS="-Wdeclaration-after-statement"
-	_SAVE_CFLAGS=$CFLAGS
-	CFLAGS="$CFLAGS $AM_CFLAGS"
-
-	AC_CACHE_CHECK([for compiler $FLAGS option],
-		ac_cv_have_declaration_after_statement,
-		[AC_COMPILE_IFELSE(
-			[AC_LANG_SOURCE([[int main () { return 0; }]])],
-			[ac_cv_have_declaration_after_statement="yes"],
-			[ac_cv_have_declaration_after_statement="no"],
-			[ac_cv_have_declaration_after_statement="maybe"])])
-	
-	if test "x$ac_cv_have_declaration_after_statement" = "xyes"; then
-		MORE_WARN_FLAGS="$MORE_WARN_FLAGS $FLAGS"
-	fi
-	CFLAGS="$_SAVE_CFLAGS"
-	AC_LANG_POP([C])
-fi
-
 # *****************
 # Add warning flags
 # *****************
 
 AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS"
-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS"
+AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_LDFLAGS])
 
 # ********************
 # Internationalisation



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]