diff options
Diffstat (limited to 'macros2')
| -rw-r--r-- | macros2/.cvsignore | 4 | ||||
| -rw-r--r-- | macros2/ChangeLog | 456 | ||||
| -rw-r--r-- | macros2/Makefile.am | 12 | ||||
| -rw-r--r-- | macros2/README.cvs-commits | 13 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 414 | ||||
| -rw-r--r-- | macros2/gnome-common.m4 | 47 | ||||
| -rw-r--r-- | macros2/gnome-compiler-flags.m4 | 141 |
7 files changed, 0 insertions, 1087 deletions
diff --git a/macros2/.cvsignore b/macros2/.cvsignore deleted file mode 100644 index 347fe394..00000000 --- a/macros2/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -macros.dep -gnome2-macros.dep diff --git a/macros2/ChangeLog b/macros2/ChangeLog deleted file mode 100644 index 30a71d92..00000000 --- a/macros2/ChangeLog +++ /dev/null @@ -1,456 +0,0 @@ -2005-02-11 James Henstridge <james@jamesh.id.au> - - * gnome-autogen.sh: preserve COPYING and INSTALL files over the - "automake --force" call. Fixes bug #161916. - -2005-01-22 Rodney Dawes <dobey@novell.com> - - * gnome-autogen.sh: Fix the (AC|IT)_PROG_INTLTOOL support for - both places where we grep for it - (version_check): If we are checking for automake = 1.4, then make - sure we error out with that error when we find it, and not >= 1.4 - since we don't actually check for >= 1.4 - - Fixes #129903 - -2004-11-24 Mariano Suárez-Alvarez <mariano@gnome.org> - - * gnome-autogen.sh: grep wants basic regexps, not extended ones: - fix the regular expression for INTLTOOL. - -2004-11-24 Rodney Dawes <dobey@novell.com> - - * gnome-autogen.sh: Add support for IT_PROG_INTLTOOL which - deprecates AC_PROG_INTLTOOL - -2004-11-09 Jordi Mallach <jordi@sindominio.net> - - * gnome-autogen.sh: Workaround automake-1.4 limitations by just - using --force if $REQUIRED_AUTOMAKE_VERSION != 1.4. This avoids - Louie's wrath too. :) - -2004-11-09 Jordi Mallach <jordi@sindominio.net> - - * gnome-autogen.sh: Call all the bootstrap programs (libtoolize, - intltoolize, gtkdocize, automake) using --force and --copy - consistently. - -2004-10-28 James Henstridge <james@jamesh.id.au> - - * gnome-autogen.sh: get rid of the code that modified PATH, - ACLOCAL_FLAGS and LD_LIBRARY_PATH based on $GNOME2_PATH, since - this was broken. It could cause configure tests to pass, when the - subsequent build would fail due to path problems. For more - details, see bug #140210. - - * gnome-autogen.sh: if the directory is read only, skip it. This - helps in cases where a directory from a failed "make distcheck" is - lying around. Should fix bug #136093. - - * gnome-autogen.sh (m4dir): fix up the AC_CONFIG_MACRO_DIR check - to work with sub-package configure.in's. - -2004-10-27 James Henstridge <james@jamesh.id.au> - - * gnome-autogen.sh (ACLOCAL): if AC_CONFIG_MACRO_DIR() is used in - configure.ac, pass that directory to aclocal. - Run libtoolize if the configure.ac file calls LT_INIT (the new - name for AC_PROG_LIBTOOL in libtool-2.0). - -2004-08-16 Kjartan Maraas <kmaraas@gnome.org> - - * gnome-autogen.sh: Add some foo to handle automake-1.9.x too. - -2004-05-13 James Henstridge <james@daa.com.au> - - * autogen.sh: Change the order the various tools are called in to - match that of autoconf's autoupdate tool. See bug 138584. - -2004-01-31 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Use automake-1.8 if available. Patch from - alexander.winston@comcast.net (Alexander Winston). Bug #132966. - -2004-01-25 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Deprecate the use of GNOME2_DIR and allow the use - of GNOME2_PATH (bug #130516). - -2004-01-02 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Run intltoolize after automake, since intltoolize - wants mkinstalldirs now. Should fix bugs #130309 and #130366. - -2003-12-13 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Change the use of head to be 'head -n -1', since - the GNU version of head appears to have changed behaviour - between version 5.0 and 5.0.9 somewhere. This should be portable - across all versions now. Fixed bug #128867. - -2003-12-08 Rodney Dawes <dobey@free.fr> - - * autogen.sh: Update automake checks to check incremental - versions in the correct order, Fixes #128691 - -2003-11-19 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Replace use of -or in a find command with -o. - Makes things work for people with less functional versions of - find. Fixes bug #127354 reported by Rolf Sponsel. - -2003-11-03 <clahey@ximian.com> - - * gnome-common.m4: Removed ENABLE_WERROR and changed name to - GNOME_MAINTAINER_MODE_DEFINES. - -2003-11-01 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Make version checking work, as pointed out by - Michael H Schimek in bug #125818. - -2003-10-31 <clahey@ximian.com> - - * gnome-common.m4: Changed name of new macro to - AM_MAINTAINER_MODE_DEFINES and added definition for ENABLE_WERROR. - -2003-10-31 <clahey@ximian.com> - - * gnome-common.m4: New macro to disable deprecated functions and - widgets when maintainer mode is on. - -2003-08-10 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Show the version found for the various build tools - like automake, autoconf, libtool, etc. Patch from Steve Chaplin - (bug #119533). - -2003-08-05 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * compile-flags.m4: Continuing to try and get the flags passed - to g++ in GNOME_CXX_WARNINGS correct. Based on our best - attempts, the current set should work for the widest range of - g++ versions (see bug #118987 for the discussion). - -2003-08-03 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * compile-flags.m4: Simplify GNOME_CXX_WARNINGS. Fixes bug - #118987. - -2003-07-28 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * compiler-flags.m4: Default setting in the - GNOME_COMPILE_WARNINGS macro is now "yes". This fixes bug - #118479 (another good bit of debugging from Steve Chaplin). - -2003-07-20 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * compiler-flags.m4: Remove some redundant options as suggested - by Steve Chaplin in bug #115475. The warnings list looks simpler - now, but is no less functional. - -2003-07-15 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Fix a typo when reporting "forbidden" m4 macros. - -2003-06-20 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Fix some strangeness in the gnome-doc-common test. - -2003-06-19 Gustavo J. A. M. Carneiro <gustavo@users.sourceforge.net> - - * autogen.sh: Inserted missing "cd $dirname" to effectively - process subdirectories, since all it was doing was to process the - toplevel dir multiple times. - - [Editor's note: also reported with patch by Elijah Newren in bug - #115481.] - -2003-05-21 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Ignore {arch} subdirectories. Fixes bug #113327. - -2003-05-04 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: - - Make this portable to Bourne-like shells. Fixes the problems - pointed out by Morten Welinder in bug #110177. - - Extend the check_m4macros() function to handle Cygwin - environments. Fixes bug #110947. - -2003-04-10 Ross Burton <ross@burtonini.com> - - * autogen.sh: Fix a typo in the glib-gettext checks. - -2003-03-07 Malcolm Tredinnick <malcolm@commsecure.com.au> - - * autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME is - what is defined by the various applications' autogen.sh. Also, - call autopoint rather than gettextize when appropriate (when - AM_GNU_GETTEXT_VERSION is present). - -2003-02-27 Mark McLoughlin <mark@skynet.ie> - - * compiler-flags.m4: fix mixed up order of arguments to - AC_ARG_ENABLE that made --enable-compile-warnings not work - as expected. - -2003-02-24 James Henstridge <james@daa.com.au> - - * autogen.sh (forbid_m4macro): add function to forbid m4 macros. - Forbid gnome-cxx-check.m4, to try and catch setups where stale - macros are left on the system. - -2003-02-21 James Henstridge <james@daa.com.au> - - * autogen.sh (version_check): if $variable is set, then assume - it is correct and skip the version check. - (autoconf): check for autoconf2.50 first, so we don't trigger - Debian's sometimes broken autoconf version sniffer. - -2003-02-19 James Henstridge <james@daa.com.au> - - * Makefile.am (GNOME2_MACROS): remove check-utmp.m4 (copied it to - libzvt, which is the only thing using it). - - * gnome-deprecated-macros.m4(GNOME_CHECK_CXX): AC_REQUIRE does not - work within AU_DEFUN, so change to a simple call to AC_PROG_CXX. - -2003-02-18 James Henstridge <james@daa.com.au> - - * autogen.sh (topdir): check to see if gnome-deprecated-macros.m4 - ended up in aclocal.m4, and warn if so. - - * gnome-platform.m4: kill this too (with a deprecation warning). - - * gnome-cxx-check.m4: move to gnome-deprecated-macros.m4 - - * gnome-pkgconfig.m4: remove, and add a deprecation warning in its - place. - - * gnome-x-checks.m4: remove, and add an AU_DEFUN in its place - telling people not to use it. - - * linger.m4: removed outright. - - * gnome-common.m4: remove GNOME_GTKDOC_CHECK, deprecated in favour - of GTK_DOC_CHECK. - - * gnome-gettext.m4: remove file (people should be using gettextize - or glib-gettextize). - - * gnome-deprecated-macros.m4: new file to hold deprecated macros. - -2003-02-14 Kalpesh Shah <kalpesh.shah@sun.com> - - * check-utmp.m4: initialize UTMP structure properly. - Fixes Bug#93774. - Patch reviewed by Andersca <andersca@gnu.org> - -2002-09-23 Bastien Nocera <hadess@hadess.net> - - * autogen.sh: exit if aclocal, autoheader, automake or autoconf - fails to run without warnings. Usually compilation would fail - afterwards with funky errors. - This is more anal than the version committed to the gnome-2-0 branch - -2002-08-18 Havoc Pennington <hp@pobox.com> - - * autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with - both automake 1.6 and 1.4 installed get the right automake. Means - compilation from CVS will now require the latest automake 1.4 - release, or manually creating symlinks called "automake-1.4" and - "aclocal-1.4" - -Mon Aug 12 23:49:41 2002 HideToshi Tajima <hidetoshi.tajima@sun.com> - - * autogen.sh : use portable -o instead of GNU-ish -or for find test - -2002-08-10 Miles Lane <miles_lane@yahoo.com> - - * autogen.sh: fix the "find" test so that the presence of - configure.in is reporteded. Each expression requires its - own -print flag. - -2002-08-10 Sebastian Rittau <srittau@jroger.in-berlin.de> - - * autogen.sh: support for configure.ac - -2002-05-10 Chema Celorio <chema@celorio.com> - - * compiler-flags.m4: fix GNOME_COMPILE_WARNINGS to work when a parameter is - passed. The arguments to AC_ARG_ENABLE where swapped - -2002-04-01 jacob berkman <jacob@ximian.com> - - * gnome-x-checks.m4 (GNOME2_X_CHECKS): kill bogus clearing of - LDFLAGS - -2001-10-29 jacob berkman <jacob@ximian.com> - - * autogen.sh: add check for glib-gettextize - -2001-10-15 Bastien Nocera <hadess@hadess.net> - - * Makefile.am, curses.m4: added curses.m4 (copied from the gnome1 - macros. this file is needed to gdialog - -2001-10-02 Darin Adler <darin@bentspoon.com> - - * autogen.sh: Complete intltool support. - -2001-10-02 Darin Adler <darin@bentspoon.com> - - * autogen.sh: Add intltool support. - -2001-09-04 Frank Belew <frb@ximian.com> - - * autogen.sh: change gettext regexp to work with non-gnu grep - -2001-08-18 Darin Adler <darin@bentspoon.com> - - * autogen.sh: Don't ask people to ignore xml-i18n-tools messages. - -2001-08-04 Darin Adler <darin@bentspoon.com> - - * autogen.sh: Update gettext logic to allow anything that - starts with AM and ends with gettext. This makes it work with - AM_GLIB_GNU_GETTEXT, which is what libbonobo is now using. - -2001-08-03 Martin Baulig <baulig@suse.de> - - * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Removed. - (GNOME_PKGCONFIG_CHECK_CFLAG): Removed. - (GNOME_PKGCONFIG_ACLOCALFLAGS): Removed. - (GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES): Removed. - (GNOME_PKGCONFIG_CHECK_MODULES): Removed. - (GNOME_CHECK_PKGCONFIG): Use $PKG_CONFIG --atleast-pkgconfig-version - to check for the pkg-config version. - -2001-07-20 Martin Baulig <baulig@suse.de> - - * gnome-pkgconfig.m4: Require pkg-config 0.8.0. - -2001-06-29 Laszlo Peter <laca@ireland.sun.com> - - * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Fix the regexp - to process all 6 version numbers. - -2001-06-22 Elliot Lee <sopwith@redhat.com> - - * gnome-gettext.m4: N'sync with the gnome1 version, bye bye buggies. - -2001-06-13 Martin Baulig <baulig@suse.de> - - * gnome-pkgconfig.m4 (GNOME_CHECK_PKGCONFIG): Require pkg-config 0.7.0 - and fix download URL. - - * gnome-platform.m4: Require pkgconfig on the GNOME 2.0 platform. - -2001-06-01 Peter Williams <peterw@ximian.com> - - * autogen.sh: s,Gnome,$PKG_NAME,g - -2001-04-13 Martin Baulig <baulig@suse.de> - - * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES): - Set variable `have_<name>' to yes or no depending on whether the - module was found or not; allows you to define automake conditionals - for optional modules. - -2001-03-24 Martin Baulig <baulig@suse.de> - - * autogen.sh: Add the xml-i18n-tools stuff here. - -2000-12-01 Martin Baulig <baulig@suse.de> - - * compile-warnings.m4: Improved compile warnings check; the - --enable-compile-warnings parameter now takes 5 different - values (no/minimum/yes/maximum/error). AC_SUBST(WARN_CFLAGS). - -2000-11-29 Martin Baulig <baulig@suse.de> - - * gnome.m4, gnome-gnorba-check.m4, gnome-fileutils.m4: Removed. - -2000-11-26 Martin Baulig <martin@home-of-linux.org> - - * gnome-x-checks.m4 (GNOME2_X_CHECKS): Use - GNOME_PKGCONFIG_CHECK_MODULES. - - * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Don't - AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]). - (GNOME_CHECK_PKGCONFIG): Check for pkg-config >= 0.4.1. - -2000-11-22 Martin Baulig <martin@home-of-linux.org> - - * gnome-pkgconfig.m4: Added GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES - to check for a list of optional modules. - - * gnome-platform.m4: Require GNOME_REQUIRE_PKGCONFIG. - -2000-11-22 Martin Baulig <martin@home-of-linux.org> - - * gnome-platform.m4: New file. This defines - GNOME_PLATFORM_GNOME_2. - - * gnome-pkgconfig.m4: Disable the --extra-flags argument to - pkg-config, this doesn't exist anymore. - -2000-11-22 Martin Baulig <martin@home-of-linux.org> - - * gnome-pkgconfig.m4: New file. This defines - GNOME_CHECK_PKGCONFIG, GNOME_REQUIRE_PKGCONFIG and - GNOME_PKGCONFIG_* macros from pkg-config. - -2000-11-21 Martin Baulig <baulig@suse.de> - - * gnome-support.m4, need-declaration.m4: Removed. - -2000-09-30 Martin Baulig <baulig@suse.de> - - * gnome-x-checks.m4: Switch to pkg-config to check for GTK+ 2.0; - Removed all `gnome_cv_passdown_x_*' variables and `USE_DEVGTK'. - - * gnome-common.m4 (GNOME_COMMON_INIT): Added the always-false - INSIDE_GNOME_COMMON automake conditional. - (GNOME_GTKDOC_CHECK): New macro. - (GNOME_DEBUG_CHECK): New macro. - -Thu Aug 24 02:28:57 2000 George Lebl <jirka@5z.com> - - * gnome-x-checks.m4: use the correct name in AC_PROVIDE - -2000-08-06 Martin Baulig <baulig@suse.de> - - * gnome-x-checks.m4 (GNOME_X_CHECKS): Renamed - to GNOME2_X_CHECKS. - -2000-07-24 Martin Baulig <martin@home-of-linux.org> - - * autogen.sh: Removed some old crap in it. - * aclocal-include.m4: Removed. - - * gnome-x-checks.m4: Check for GTK+ 2.0. - -2000-07-24 Martin Baulig <baulig@suse.de> - - * autogen.sh: Make it work with AM_GNOME2_GETTEXT. - * check-utmp.m4: New file. - -2000-07-24 Martin Baulig <baulig@suse.de> - - Synced with gnome-libs/gnome-data. - -2000-06-09 Martin Baulig <martin@home-of-linux.org> - - * gnome-common.m4: We need this here as well. - -2000-05-29 Martin Baulig <baulig@suse.de> - - * Makefile.am: New file. Install this stuff into - `$(datadir)/aclocal/gnome2-macros'. - - * gnome.m4: New file. Copied from `hack-macros' dir. - - * autogen.sh: New file. Copied from `macros' dir. - diff --git a/macros2/Makefile.am b/macros2/Makefile.am deleted file mode 100644 index 5cfdc6f7..00000000 --- a/macros2/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Please update this variable if any new macros are created - -GNOME2_MACROS = \ - gnome-common.m4 \ - gnome-compiler-flags.m4 - -EXTRA_DIST = $(GNOME2_MACROS) gnome-autogen.sh - -aclocaldir = $(datadir)/aclocal -aclocal_DATA = $(GNOME2_MACROS) - -bin_SCRIPTS = gnome-autogen.sh diff --git a/macros2/README.cvs-commits b/macros2/README.cvs-commits deleted file mode 100644 index 88e3d581..00000000 --- a/macros2/README.cvs-commits +++ /dev/null @@ -1,13 +0,0 @@ -This directory is *shared* between a lot of modules in GNOME CVS - -which means that every change you're doing here immediately affects -a very large number of modules. - -Please, do *ALWAYS ASK FIRST* on gnome-hackers@gnome.org before you -commit anything to this directory. If unsure, feel free to send me -a patch <martin@gnome.org> and I'll commit it for you it it's ok. - -Thanks for your understanding, - -August 1st, 2001 -Martin Baulig <martin@gnome.org> - diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh deleted file mode 100644 index f43f4a9b..00000000 --- a/macros2/gnome-autogen.sh +++ /dev/null @@ -1,414 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -PKG_NAME=${PKG_NAME:-Package} -srcdir=${srcdir:-.} - -# default version requirements ... -REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53} -REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.4} -REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3} -REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40} -REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} -REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25} -REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} -REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} -REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0} - -# a list of required m4 macros. Package can set an initial value -REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} -FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-} - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ;; - *c*,* ) ECHO_N=-n ;; - *) ECHO_N= ;; -esac - -# some terminal codes ... -boldface="`tput bold 2>/dev/null`" -normal="`tput sgr0 2>/dev/null`" -printbold() { - echo $ECHO_N "$boldface" - echo "$@" - echo $ECHO_N "$normal" -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variable - eval "$vc_variable=$vc_checkprog" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs="`$ACLOCAL --print-ac-dir`" - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - cm_macrodirs="$cm_macrodirs $2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr - fi - return $cm_status -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false - -configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -o -name configure.in -print`" -for configure_ac in $configure_files; do - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || \ - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^\(AC\|IT\)_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi -done - -DIE=0 - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1 -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;; - 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;; - 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;; - 1.8*) automake_progs="automake-1.8 automake-1.9" ;; - 1.9*) automake_progs="automake-1.9" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1 - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" || DIE=1 - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" || DIE=1 - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" || DIE=1 - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" || DIE=1 - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" || DIE=1 - require_m4macro gtk-doc.m4 -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " || DIE=1 -fi - -check_m4macros || DIE=1 - -if [ "$DIE" -eq 1 ]; then - exit 1 -fi - -if [ "$#" = 0 ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || \ - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^\(AC\|IT\)_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - cp -pf COPYING COPYING.autogen_bak - cp -pf INSTALL INSTALL.autogen_bak - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --force --copy || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING - cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL - rm -f COPYING.autogen_bak INSTALL.autogen_bak - - cd "$topdir" - fi -done - -conf_flags="--enable-maintainer-mode" - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4 deleted file mode 100644 index e4747e9b..00000000 --- a/macros2/gnome-common.m4 +++ /dev/null @@ -1,47 +0,0 @@ -# gnome-common.m4 -# - -dnl GNOME_COMMON_INIT - -AC_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) - - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi - - AC_SUBST([ACLOCAL_AMFLAGS]) -]) - -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) - - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi -]) - -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) - - if test $USE_MAINTAINER_MODE = yes; then - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED" - else - DISABLE_DEPRECATED="" - fi - AC_SUBST(DISABLE_DEPRECATED) -]) diff --git a/macros2/gnome-compiler-flags.m4 b/macros2/gnome-compiler-flags.m4 deleted file mode 100644 index 73681784..00000000 --- a/macros2/gnome-compiler-flags.m4 +++ /dev/null @@ -1,141 +0,0 @@ -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) - - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) |