+2004-05-26 James Henstridge <james@daa.com.au>
+
+ * macros2/gnome-compiler-warnings.m4: some small cleanups.
+
+ * macros2/gnome-common.m4 (GNOME_COMMON_INIT): since caching is
+ turned off in all recent Autoconfs, it doesn't make sense to use
+ it. Change implementation to instead make sure ${ACLOCAL_FLAGS}
+ gets passed to aclocal when called from the makefile.
+
+ * macros2/Makefile.am: alter installation so that it puts the
+ macros directly into $(datadir)/aclocal instead of
+ $(datadir)/aclocal/gnome2-macros
+
+ * autogen.sh (REQUIRED_AUTOMAKE_VERSION): use a modern version of
+ automake.
+
+ * macros2/gnome-compiler-flags.m4: move from compiler-flags.m4 to
+ reduce chance of collisions.
+
+ * macros2/gnome-autogen.sh: move from autogen.sh
+
+ * Makefile.am (SUBDIRS): don't build bin/ and macros/ directories.
+
+ * configure.in: don't create makefiles for bin/ and macros/
+ directories.
+ Since we don't actually build the support/ directory (since 2001),
+ remove the matching parts from the configure script.
+
2004-05-13 James Henstridge <james@daa.com.au>
* gnome-common.spec.in: simplify and update spec file.
-SUBDIRS = bin macros macros2 doc doc-build
+SUBDIRS = macros2 doc-build
-EXTRA_DIST = gnome-common.spec
+EXTRA_DIST = gnome-common.spec doc/usage.txt
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-PKG_NAME="Gnome Skeleton"
+REQUIRED_AUTOMAKE_VERSION=1.7
+
+PKG_NAME="Gnome Common Macros"
(test -f $srcdir/configure.in \
## put other tests here
exit 1
}
-. $srcdir/macros2/autogen.sh
+. $srcdir/macros2/gnome-autogen.sh
-AC_INIT(macros2/gnome-common.m4)
-
-AM_INIT_AUTOMAKE(gnome-common, 2.4.0)
+AC_PREREQ(2.54)
+AC_INIT([gnome-common], [2.7.0],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common])
+AC_CONFIG_SRCDIR([macros2/gnome-autogen.sh])
+AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
-AM_CONDITIONAL(INSIDE_GNOME_COMMON, true)
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CPP
-AC_STDC_HEADERS
-AM_PROG_LIBTOOL
-
-AC_PROG_AWK
-
-AC_PATH_PROG(PKG_CONFIG, pkg-config)
-if test "!" -x "$PKG_CONFIG" ; then
- AC_MSG_ERROR([
-*** You need the latest pkg-config.
-*** Get the latest version of pkg-config from
-*** <http://www.freedesktop.org/software/pkgconfig/>.])
-fi
-AC_SUBST(PKG_CONFIG)
-
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
gnome-common.spec
-macros/Makefile
macros2/Makefile
-bin/Makefile
-doc/Makefile
doc-build/Makefile
doc-build/gnome-doc-common
])
+AC_OUTPUT
## Please update this variable if any new macros are created
GNOME2_MACROS = \
- compiler-flags.m4 \
- curses.m4 \
gnome-common.m4 \
- gnome-deprecated-macros.m4
+ gnome-compiler-flags.m4
-EXTRA_DIST = $(GNOME2_MACROS) autogen.sh
-MAINTAINERCLEANFILES = macros2.dep
+EXTRA_DIST = $(GNOME2_MACROS) gnome-autogen.sh
-@MAINT@macros2.dep: Makefile.am
-@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=macros2/%)' > $@
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = $(GNOME2_MACROS)
-if INSIDE_GNOME_COMMON
-gnome2_aclocaldir = $(datadir)/aclocal/gnome2-macros
-
-gnome2-macros.dep: Makefile.am
- @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=$(gnome2_aclocaldir)/%)' > $@
-
-gnome2_aclocal_DATA = $(GNOME2_MACROS) autogen.sh gnome2-macros.dep
-
-endif
+bin_SCRIPTS = gnome-autogen.sh
+++ /dev/null
-dnl Curses detection: Munged from Midnight Commander's configure.in
-dnl
-dnl What it does:
-dnl =============
-dnl
-dnl - Determine which version of curses is installed on your system
-dnl and set the -I/-L/-l compiler entries and add a few preprocessor
-dnl symbols
-dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that
-dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
-dnl Makefile.in's
-dnl - Modify the following configure variables (these are the only
-dnl curses.m4 variables you can access from within configure.in)
-dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
-dnl an ncurses.h that's been renamed to curses.h
-dnl is found.
-dnl CURSES_LIBS - sets -L and -l's appropriately
-dnl CFLAGS - if --with-sco, add -D_SVID3
-dnl has_curses - exports result of tests to rest of configure
-dnl
-dnl Usage:
-dnl ======
-dnl 1) Add lines indicated below to acconfig.h
-dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in
-dnl 3) Instead of #include <curses.h> you should use the following to
-dnl properly locate ncurses or curses header file
-dnl
-dnl #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-dnl #include <ncurses.h>
-dnl #else
-dnl #include <curses.h>
-dnl #endif
-dnl
-dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags
-dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS
-dnl
-dnl Notes with automake:
-dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from
-dnl configure.in
-dnl - your Makefile.am can look something like this
-dnl -----------------------------------------------
-dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR)
-dnl if HAS_CURSES
-dnl CURSES_TARGETS=name_of_curses_prog
-dnl endif
-dnl bin_PROGRAMS = other_programs $(CURSES_TARGETS)
-dnl other_programs_SOURCES = blah blah blah
-dnl name_of_curses_prog_SOURCES = blah blah blah
-dnl other_programs_LDADD = blah
-dnl name_of_curses_prog_LDADD = blah $(CURSES_LIBS)
-dnl -----------------------------------------------
-dnl
-dnl
-dnl The following lines should be added to acconfig.h:
-dnl ==================================================
-dnl
-dnl /*=== Curses version detection defines ===*/
-dnl /* Found some version of curses that we're going to use */
-dnl #undef HAS_CURSES
-dnl
-dnl /* Use SunOS SysV curses? */
-dnl #undef USE_SUNOS_CURSES
-dnl
-dnl /* Use old BSD curses - not used right now */
-dnl #undef USE_BSD_CURSES
-dnl
-dnl /* Use SystemV curses? */
-dnl #undef USE_SYSV_CURSES
-dnl
-dnl /* Use Ncurses? */
-dnl #undef USE_NCURSES
-dnl
-dnl /* If you Curses does not have color define this one */
-dnl #undef NO_COLOR_CURSES
-dnl
-dnl /* Define if you want to turn on SCO-specific code */
-dnl #undef SCO_FLAVOR
-dnl
-dnl /* Set to reflect version of ncurses *
-dnl * 0 = version 1.*
-dnl * 1 = version 1.9.9g
-dnl * 2 = version 4.0/4.1 */
-dnl #undef NCURSES_970530
-dnl
-dnl /*=== End new stuff for acconfig.h ===*/
-dnl
-
-
-AC_DEFUN([AC_CHECK_CURSES],[
- search_ncurses=true
- screen_manager=""
- has_curses=false
-
- CFLAGS=${CFLAGS--O}
-
- AC_SUBST(CURSES_LIBS)
- AC_SUBST(CURSES_INCLUDEDIR)
-
- AC_ARG_WITH(sco,
- [ --with-sco Use this to turn on SCO-specific code],[
- if test x$withval = xyes; then
- AC_DEFINE(SCO_FLAVOR)
- CFLAGS="$CFLAGS -D_SVID3"
- fi
- ])
-
- AC_ARG_WITH(sunos-curses,
- [ --with-sunos-curses Used to force SunOS 4.x curses],[
- if test x$withval = xyes; then
- AC_USE_SUNOS_CURSES
- fi
- ])
-
- AC_ARG_WITH(osf1-curses,
- [ --with-osf1-curses Used to force OSF/1 curses],[
- if test x$withval = xyes; then
- AC_USE_OSF1_CURSES
- fi
- ])
-
- AC_ARG_WITH(vcurses,
- [ --with-vcurses[=incdir] Used to force SysV curses],
- if test x$withval != xyes; then
- CURSES_INCLUDEDIR="-I$withval"
- fi
- AC_USE_SYSV_CURSES
- )
-
- AC_ARG_WITH(ncurses,
- [ --with-ncurses[=dir] Compile with ncurses/locate base dir],
- if test x$withval = xno ; then
- search_ncurses=false
- elif test x$withval != xyes ; then
- CURSES_LIBS="$LIBS -L$withval/lib -lncurses"
- CURSES_INCLUDEDIR="-I$withval/include"
- search_ncurses=false
- screen_manager="ncurses"
- AC_DEFINE(USE_NCURSES)
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- fi
- )
-
- if $search_ncurses
- then
- AC_SEARCH_NCURSES()
- fi
-
-
-])
-
-
-AC_DEFUN([AC_USE_SUNOS_CURSES], [
- search_ncurses=false
- screen_manager="SunOS 4.x /usr/5include curses"
- AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
- AC_DEFINE(USE_SUNOS_CURSES)
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- AC_DEFINE(NO_COLOR_CURSES)
- AC_DEFINE(USE_SYSV_CURSES)
- CURSES_INCLUDEDIR="-I/usr/5include"
- CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
- AC_MSG_RESULT(Please note that some screen refreshs may fail)
-])
-
-AC_DEFUN([AC_USE_OSF1_CURSES], [
- AC_MSG_RESULT(Using OSF1 curses)
- search_ncurses=false
- screen_manager="OSF1 curses"
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- AC_DEFINE(NO_COLOR_CURSES)
- AC_DEFINE(USE_SYSV_CURSES)
- CURSES_LIBS="-lcurses"
-])
-
-AC_DEFUN([AC_USE_SYSV_CURSES], [
- AC_MSG_RESULT(Using SysV curses)
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- AC_DEFINE(USE_SYSV_CURSES)
- search_ncurses=false
- screen_manager="SysV/curses"
- CURSES_LIBS="-lcurses"
-])
-
-dnl AC_ARG_WITH(bsd-curses,
-dnl [--with-bsd-curses Used to compile with bsd curses, not very fancy],
-dnl search_ncurses=false
-dnl screen_manager="Ultrix/cursesX"
-dnl if test $system = ULTRIX
-dnl then
-dnl THIS_CURSES=cursesX
-dnl else
-dnl THIS_CURSES=curses
-dnl fi
-dnl
-dnl CURSES_LIBS="-l$THIS_CURSES -ltermcap"
-dnl AC_DEFINE(HAS_CURSES)
-dnl has_curses=true
-dnl AC_DEFINE(USE_BSD_CURSES)
-dnl AC_MSG_RESULT(Please note that some screen refreshs may fail)
-dnl AC_MSG_WARN(Use of the bsdcurses extension has some)
-dnl AC_MSG_WARN(display/input problems.)
-dnl AC_MSG_WARN(Reconsider using xcurses)
-dnl)
-
-
-dnl
-dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename
-dnl
-AC_DEFUN([AC_NCURSES], [
- if $search_ncurses
- then
- if test -f $1/$2
- then
- AC_MSG_RESULT(Found ncurses on $1/$2)
- CURSES_LIBS="$3"
- CURSES_INCLUDEDIR="$4"
- search_ncurses=false
- screen_manager=$5
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- AC_DEFINE(USE_NCURSES)
- fi
- fi
-])
-
-AC_DEFUN([AC_SEARCH_NCURSES], [
- AC_CHECKING("location of ncurses.h file")
-
- AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
- AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
- AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-
- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-
- AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-
- dnl
- dnl We couldn't find ncurses, try SysV curses
- dnl
- if $search_ncurses
- then
- AC_EGREP_HEADER(init_color, /usr/include/curses.h,
- AC_USE_SYSV_CURSES)
- AC_EGREP_CPP(USE_NCURSES,[
-#include <curses.h>
-#ifdef __NCURSES_H
-#undef USE_NCURSES
-USE_NCURSES
-#endif
-],[
- CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- AC_DEFINE(USE_NCURSES)
- search_ncurses=false
- screen_manager="ncurses installed as curses"
-])
- fi
-
- dnl
- dnl Try SunOS 4.x /usr/5{lib,include} ncurses
- dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES
- dnl should be replaced by a more fine grained selection routine
- dnl
- if $search_ncurses
- then
- if test -f /usr/5include/curses.h
- then
- AC_USE_SUNOS_CURSES
- fi
- else
- # check for ncurses version, to properly ifdef mouse-fix
- AC_MSG_CHECKING(for ncurses version)
- ncurses_version=unknown
-cat > conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
-#include "confdefs.h"
-#ifdef RENAMED_NCURSES
-#include <curses.h>
-#else
-#include <ncurses.h>
-#endif
-#undef VERSION
-VERSION:NCURSES_VERSION
-EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
- egrep "VERSION:" >conftest.out 2>&1; then
-changequote(,)dnl
- ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'`
-changequote([,])dnl
- fi
- rm -rf conftest*
- AC_MSG_RESULT($ncurses_version)
- case "$ncurses_version" in
-changequote(,)dnl
- 4.[01])
-changequote([,])dnl
- AC_DEFINE(NCURSES_970530,2)
- ;;
- 1.9.9g)
- AC_DEFINE(NCURSES_970530,1)
- ;;
- 1*)
- AC_DEFINE(NCURSES_970530,0)
- ;;
- esac
- fi
-])
-
-
-
-
-
AC_DEFUN([GNOME_COMMON_INIT],
[
- AC_CACHE_VAL(ac_cv_gnome_aclocal_dir,
- [ac_cv_gnome_aclocal_dir="$GNOME_COMMON_MACROS_DIR"])
- AC_CACHE_VAL(ac_cv_gnome_aclocal_flags,
- [ac_cv_gnome_aclocal_flags="$ACLOCAL_FLAGS"])
- GNOME_ACLOCAL_DIR="$ac_cv_gnome_aclocal_dir"
- GNOME_ACLOCAL_FLAGS="$ac_cv_gnome_aclocal_flags"
- AC_SUBST(GNOME_ACLOCAL_DIR)
- AC_SUBST(GNOME_ACLOCAL_FLAGS)
-
- ACLOCAL="$ACLOCAL $GNOME_ACLOCAL_FLAGS"
-
- AM_CONDITIONAL(INSIDE_GNOME_DOCU, false)
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+ AC_SUBST([ACLOCAL_AMFLAGS])
])
AC_DEFUN([GNOME_DEBUG_CHECK],
[
- AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no)
+ 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,
+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
[Enable additional debugging at the expense of performance and size])
fi
])
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
dnl More compiler warnings
dnl ******************************
- if test -z "$1" ; then
- default_compile_warnings=yes
- else
- default_compile_warnings="$1"
- fi
-
AC_ARG_ENABLE(compile-warnings,
- [ --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings.],, [enable_compile_warnings="$default_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
AC_MSG_RESULT($warning_flags)
AC_ARG_ENABLE(iso-c,
- [ --enable-iso-c Try to warn if code is not ISO C ],,
- enable_iso_c=no)
+ 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=
dnl For C++, do basically the same thing.
AC_DEFUN([GNOME_CXX_WARNINGS],[
- AC_ARG_ENABLE(cxx-warnings,
- [ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum)
+ 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=
AC_MSG_RESULT($warnCXXFLAGS)
AC_ARG_ENABLE(iso-cxx,
- [ --enable-iso-cxx Try to warn if code is not ISO C++ ],,
- enable_iso_cxx=no)
+ 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=
+++ /dev/null
--*- mode: autoconf -*-
-
-# GNOME_AUTOGEN_OBSOLETE
-# this marker is checked for in the aclocal.m4 file to check for bad macros ...
-
-AU_DEFUN([AM_GNOME2_GETTEXT], [AM_GLIB_GNU_GETTEXT])
-AU_DEFUN([GNOME_GTKDOC_CHECK], [GTK_DOC_CHECK])
-AU_DEFUN([GNOME2_X_CHECKS], [])
-AU_DEFUN([GNOME_PTHREAD_CHECK], [])
-AU_DEFUN([GNOME_CHECK_PKGCONFIG], [])
-AU_DEFUN([GNOME_REQUIRE_PKGCONFIG], [])
-AU_DEFUN([GNOME_PLATFORM_GNOME_2], [])
-
-AU_DEFUN([GNOME_CHECK_CXX],
-[
- # see if a C++ compiler exists and works
- AC_PROG_CXX
- if test "x$ac_cv_prog_cxx_works" = xno; then
- AC_MSG_WARN(ifelse([$1], , "No C++ compiler", [$1]))
- fi
- AM_CONDITIONAL(CXX_PRESENT, test "x$ac_cv_prog_cxx_works" != xno)
-])
-
-# for aclocal-1.4's benefit
-# AC_DEFUN([AM_GNOME2_GETTEXT], [])
-# AC_DEFUN([GNOME_GTKDOC_CHECK], [])
-# AC_DEFUN([GNOME2_X_CHECKS], [])
-# AC_DEFUN([GNOME_PTHREAD_CHECK], [])
-# AC_DEFUN([GNOME_CHECK_PKGCONFIG], [])
-# AC_DEFUN([GNOME_REQUIRE_PKGCONFIG], [])
-# AC_DEFUN([GNOME_PLATFORM_GNOME_2], [])
-# AC_DEFUN([GNOME_CHECK_CXX], [])
projects / platform / upstream / gnome-common.git / commitdiff