From 755625c75897a17da971d2252224a10bb39b1cf2 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 5 May 2010 11:52:20 +0100 Subject: [PATCH] build: Clean up build dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Depend on autoconf 2.63 • Depend on automake 1.11 • Depend on gobject-introspection 0.6.7 • Depend on gtk-doc 1.13 • Remove Shave from the build --- build/autotools/Makefile.am.silent | 6 --- build/autotools/shave-libtool.in | 69 --------------------------- build/autotools/shave.in | 76 ------------------------------ build/autotools/shave.m4 | 73 ---------------------------- configure.ac | 38 ++++----------- 5 files changed, 10 insertions(+), 252 deletions(-) delete mode 100644 build/autotools/shave-libtool.in delete mode 100644 build/autotools/shave.in delete mode 100644 build/autotools/shave.m4 diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent index 249f6af2e..8576846ec 100644 --- a/build/autotools/Makefile.am.silent +++ b/build/autotools/Makefile.am.silent @@ -1,10 +1,5 @@ # custom rules for quiet builds -if USE_SHAVE -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -QUIET_LN = $(Q:@=@echo ' LN '$@;) -QUIET_RM = $(Q:@=@echo ' RM '$@;) -else QUIET_GEN = $(AM_V_GEN) QUIET_LN = $(QUIET_LN_$(V)) @@ -14,4 +9,3 @@ QUIET_LN_0 = @echo ' LN '$@; QUIET_RM = $(QUIET_RM_$(V)) QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) QUIET_RM_0 = @echo ' RM '$@; -endif # USE_SHAVE diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in deleted file mode 100644 index 1f3a720c1..000000000 --- a/build/autotools/shave-libtool.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the real libtool to use -LIBTOOL="$1" -shift - -# if 1, don't print anything, the underlaying wrapper will do it -pass_though=0 - -# scan the arguments, keep the right ones for libtool, and discover the mode -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - preserved_args="$preserved_args $opt" - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -case "$mode" in -compile) - # shave will be called and print the actual CC/CXX/LINK line - preserved_args="$preserved_args --shave-mode=$mode" - pass_though=1 - ;; -link) - preserved_args="$preserved_args --shave-mode=$mode" - Q=" LINK " - ;; -*) - # let's u - # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_though -eq 0; then - echo "$Q$output" - fi - $LIBTOOL --silent $preserved_args -else - echo $LIBTOOL $preserved_args - $LIBTOOL $preserved_args -fi diff --git a/build/autotools/shave.in b/build/autotools/shave.in deleted file mode 100644 index 174641e9b..000000000 --- a/build/autotools/shave.in +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the tool to wrap (cc, cxx, ar, ranlib, ..) -tool="$1" -shift - -# the reel tool (to call) -REEL_TOOL="$1" -shift - -pass_through=0 -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --shave-mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -# mode=link is handled in the libtool wrapper -case "$mode,$tool" in -link,*) - pass_through=1 - ;; -*,cxx) - Q=" CXX " - ;; -*,cc) - Q=" CC " - ;; -*,fc) - Q=" FC " - ;; -*,f77) - Q=" F77 " - ;; -*,*) - # should not happen - Q=" CC " - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_through -eq 0; then - echo "$Q$output" - fi - $REEL_TOOL $preserved_args -else - echo $REEL_TOOL $preserved_args - $REEL_TOOL $preserved_args -fi diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 deleted file mode 100644 index 0c2c9f5a0..000000000 --- a/build/autotools/shave.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -dnl LIBTOOL, you don't want the configure tests to have these variables -dnl re-defined. -dnl * This macro requires GNU make's -s option. - -AC_DEFUN([_SHAVE_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$1"]) - AC_SUBST(shavedir) - - dnl make is now quiet - AC_SUBST([MAKEFLAGS], [-s]) - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) - - dnl we need sed - AC_CHECK_PROG(SED,sed,sed,false) - - dnl substitute libtool - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - diff --git a/configure.ac b/configure.ac index c4701a9e3..b55d091e4 100644 --- a/configure.ac +++ b/configure.ac @@ -45,18 +45,22 @@ m4_define([clutter_api_version], [1.0]) m4_define([clutter_interface_age], [0]) m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)]) -AC_PREREQ([2.59]) +AC_PREREQ([2.63]) AC_INIT([clutter], [clutter_version], - [http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter]) + [http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter], + [clutter], + [http://www.clutter-project.org]) AC_CONFIG_SRCDIR([clutter/clutter.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build]) AC_CONFIG_MACRO_DIR([build/autotools]) -AM_INIT_AUTOMAKE([1.10 foreign -Wno-portability no-define dist-bzip2 check-news]) +AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define dist-bzip2 check-news]) + +AM_SILENT_RULES([yes]) CLUTTER_MAJOR_VERSION=clutter_major_version CLUTTER_MINOR_VERSION=clutter_minor_version @@ -94,17 +98,11 @@ AM_PROG_CC_C_O LT_PREREQ([2.2.6]) LT_INIT([disable-static]) -# Disable dolt; we should depend on libtool 2.2 -#DOLT - # Checks for header files. AC_HEADER_STDC # Checks for typedefs, structures, and compiler characteristics. -AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) - -PKG_PROG_PKG_CONFIG +AM_PATH_GLIB_2_0 dnl ======================================================================== @@ -776,11 +774,11 @@ AC_SUBST(CLUTTER_LIBS) dnl === GObject-Introspection check =========================================== -GOBJECT_INTROSPECTION_CHECK([0.6.4]) +GOBJECT_INTROSPECTION_CHECK([0.6.7]) dnl === GTK Doc check ========================================================= -GTK_DOC_CHECK([1.11]) +GTK_DOC_CHECK([1.13]) # we don't want to build the documentation from a Git clone unless we # explicitly tell configure to do so; this allows avoiding to recurse into @@ -843,22 +841,6 @@ GLIB_DEFINE_LOCALEDIR(LOCALEDIR) dnl =========================================================================== -m4_ifdef([AM_SILENT_RULES], - [ - AM_SILENT_RULES([yes]) - use_shave=no - ], - [ - SHAVE_INIT([build/autotools], [enable]) - AC_CONFIG_FILES([ - build/autotools/shave - build/autotools/shave-libtool - ]) - use_shave=yes - ]) - -AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) - AC_CONFIG_FILES([ Makefile build/Makefile