summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog388
-rw-r--r--macros/Makefile.am13
-rw-r--r--macros/aclocal-include.m42
-rw-r--r--macros/autogen.sh126
-rw-r--r--macros/compiler-flags.m44
-rw-r--r--macros/gnome-bonobo-check.m424
-rw-r--r--macros/gnome-guile-checks.m415
-rw-r--r--macros/gnome-libgtop-check.m422
-rw-r--r--macros/gnome-pilot.m4211
-rw-r--r--macros/gnome-print-check.m4180
-rw-r--r--macros/gnome-vfs.m410
-rw-r--r--macros/gnome-xml-check.m44
-rw-r--r--macros/gnome.m46
13 files changed, 233 insertions, 772 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index d8d19331..33918c03 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,278 +1,3 @@
-2002-11-27 Stanislav Brabec <sbrabec@suse.cz>
-
- * gnome-pilot.m4: Added missing quotes:
- PISOCK_LIBS="-lpisock -lpisync"
-
-2002-09-20 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: fix problem where -lpisync was not linked in if
- you didn't specify --with-pisock
-
-2002-09-16 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: check for pilot-link 0.11.4 by default
-
-2002-09-08 Havoc Pennington <hp@pobox.com>
-
- * autogen.sh: hardcode automake-1.4
-
-2002-08-21 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: add -lpisync to PISOCK_LIBS
-
-2002-05-15 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: Fix quoting for AC_MSG_*
-
-2002-03-10 Sebastian Rittau <srittau@jroger.in-berlin.de>
-
- * Makefile.am:
- Distribute gnome-pilot.m4
-
-2002-02-10 Chema Celorio <chema@celorio.com>
-
- * Port to the GNOME 2.0 platform
-
-2002-02-08 Chema Celorio <chema@celorio.com>
-
- * configure.in: 0.12.0 here we go
-2001-12-11 Israel Escalante <israel@ximian.com>
-
- * Release 0.10.0.
-
-2001-11-28 Sebastian Rittau <srittau@jroger.in-berlin.de>
-
- * gnome-pilot.m4 (PILOT_LINK_HOOK):
- Fixed a typo: inlude -> include
-
-2001-10-24 jacob berkman <jacob@ximian.com>
-
- * aclocal-include.m4 (AM_ACLOCAL_INCLUDE): do a test that is not
- only always false, but works with autoconf 2.52 and isn't trying
- to be too smart
-
-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-16 Eskil Heyn Olsen <eskil@eskil.dk>
-
- * gnome-pilot.m4:
- PISOCK_CFLAGS no longer contains pilot-link version.
-
-2001-09-09 Eskil Heyn Olsen <eskil@eskil.dk>
-
- * gnome-pilot.m4:
- Stuff to check version of gnome-pilot
-
-2001-08-20 Pavel Roskin <proski@gnu.org>
-
- * gnome-undelfs.m4 (GNOME_UNDELFS_CHECKS): Specify additional
- includes when testing for ext2fs/ext2fs.h.
-
- * gnome-vfs.m4 (GNOME_WITH_VFS): Specify additional includes
- when testing for rpc/pmap_clnt.h. Needed for Autoconf 2.50+
- only - older versions don't try to compile headers and ignore
- this argument.
-
-2001-08-04 Darin Adler <darin@bentspoon.com>
-
- * .cvsignore: Ignore generated .dep file.
-
-2001-08-02 J.H.M. Dassen (Ray) <jdassen@debian.org>
-
- * gnome-guile-checks.m4: Made "--without-guile" work. Added $guile_msg
- for reporting back.
-
-2001-07-24 Jody Goldberg <jgoldberg@home.com>
-
- * psiconv.m4 : Add psion macros from Frodo Looijaard <frodol@dds.nl>
-
-2001-07-24 Frederic Crozat <fcrozat@mandrakesoft.com>
-
- * gnome-print-check.m4 (AM_PATH_GNOME_PRINT):
- Correct minimal version test
-
-2001-06-22 Eskil Heyn Olsen <eskil@eskil.dk>
-
- * gnome-pilot.m4:
- Fixed the cat of pi-version.h
-
-2001-06-20 Havoc Pennington <hp@redhat.com>
-
- * gnome.m4: fix to include the CFLAGS for extra libraries
-
-2001-06-13 Pavel Roskin <proski@gnu.org>
-
- * gnome-fileutils.m4: Always explicitly declare main() with the
- return type `int'. Don't use exit() since it may be undeclared.
- Use `return' instead.
- * gnome-pilot.m4: Likewise.
- * gperf-check.m4: Likewise.
- * linger.m4: Likewise.
-
-2001-06-01 Peter Williams <peterw@ximian.com>
-
- * autogen.sh: s,Gnome,$PKG_NAME,g
-
-2001-05-24 Arturo Espinosa Aldama <arturo@ximian.com>
-
- * 0.5 RELEASE
-
-2001-05-24 jacob berkman <jacob@ximian.com>
-
- * gnome-pthread-check.m4 (GNOME_PTHREAD_CHECK): add hp-ux specific
- check from glib
-
-2001-05-19 Jody Goldberg <jgoldberg@home.com>
-
- * gnome-gettext.m4 : Add BUILD_INCLUDED_LIBINTL so that newer versions
- work.
-
-2001-04-16 Jaka Mocnik <jaka@gnu.org>
-
- * gnome-print-check.m4: change $(cmd) to `cmd` in order to make it
- usable in non-bash bourne shells.
-
-2001-03-01 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: quote a test and make sure incdir is always set
- so 'cat' works
-
-2001-02-21 Lauris Kaplinski <lauris@ximian.com>
-
- * gnome-print-check.m4: Replaced the awk alchemy with sed alchemy.
- I seems to work now as long as gnome-config is working - but that is
- the whole point of gnome-config, isn't it?
-
-2001-02-19 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: Revert my previous patch now that gnome-pim and
- evolution are fixed to accomodate the change
-
-2001-02-19 JP Rosevear <jpr@ximian.com>
-
- * gnome-pilot.m4: AC_SUBST the PISOCK_LIBDIR var
-
-2001-02-17 Lauris Kaplinski <lauris@ximian.com>
-
- * gnome-print-check.m4: Remove most of stuff here, but now
- it at least WORKS
-
-2001-02-07 Kenneth Christiansen <kenneth@gnu.org>
-
- * autogen.sh: Added test for xml-i18n-tools if
- AM_PROG_XML_I18N_TOOLS is found.
-
-2001-01-05 Maciej Stachowiak <mjs@eazel.com>
-
- * autogen.sh: Added missing PROG.
-
-2001-01-05 Maciej Stachowiak <mjs@eazel.com>
-
- * autogen.sh: xml-i18n-toolize if AM_PROG_XML_I18N_TOOLS is found
- in configure.in.
-
-2000-11-05 Martin Baulig <baulig@suse.de>
-
- * gnome-bonobo-check.m4 (BONOBO_CFLAGS, BONOBO_LIBS): Added
- stuff for `bonobox'.
-
-2000-08-01 Pavel Roskin <proski@gnu.org>
-
- * curses.m4: AC_WARN replaced with AC_MSG_WARN in comments
-
-2000-06-23 Stanislav Brabec <utx@penguin.cz>
-
- * gnome-pilot.m4: Use 'PISOCK_INCLUDEDIR' in pisock version check.
-
-2000-06-17 Dan Winship <danw@helixcode.com>
-
- * autogen.sh: exit immediately if aclocal, autoheader, automake,
- or autoconf fails, rather than continuing on with broken state.
- (In the aclocal case, print a hopefully-useful explanatory
- message.)
-
-2000-06-13 Martin Baulig <baulig@suse.de>
-
- * gnome-bonobo-check.am (AM_BONOBO_USES_OAF): New macro.
- Checks whether Bonobo uses OAF and defines `BONOBO_USES_OAF'
- if appropriate. Also provides `BONOBO_USES_OAF' automake
- conditional.
-
-2000-06-13 Martin Baulig <baulig@suse.de>
-
- * Makefile.am (EXTRA_DIST): Added `gnome-gettext.m4'.
- (gnome_aclocal_DATA): Added `gnome-gettext.m4'.
-
-2000-05-29 Martin Baulig <baulig@suse.de>
-
- * gnome-autogen.sh: Moved to the `bin/' directory.
-
-2000-05-29 Martin Baulig <baulig@suse.de>
-
- * gnome-autogen.sh: If `USE_GNOME_2_MACROS' is set, use the
- GNOME 2.0 macros from the `macros2' directory.
-
-2000-05-29 Martin Baulig <baulig@suse.de>
-
- * gnome-common.m4, Makefile.am: Install macros to
- `$(datadir)/aclocal/gnome-macros' when INSIDE_GNOME_COMMON.
-
- * gnome-autogen.sh: New file. When using gnome-common instead
- of the macros/ directory, use this in your autogen.sh.
-
-2000-05-15 Russell Steinthal <rms39@columbia.edu>
-
- * gnome-pilot.m4 (PILOT_LIBS): An attempt to fix the gnome-pilot
- check on Solaris (`$GNOME_CONFIG ...` returns more than one word,
- so we need quotes around it to keep test from bombing out)
-
-2000-05-01 Dan Winship <danw@helixcode.com>
-
- * gnome-pilot.m4 (PILOT_LIBS): "But that trick NEVER works!"
- "This time for sure!"
-
-Sun Apr 23 12:15:14 2000 George Lebl <jirka@5z.com>
-
- * gnome.m4: add an extra lib of docklets. These checks are
- braindamaged though, they don't fail and thus gnome-core for
- example compiles without gnomecc. There need to be separate .m4
- files or checks
-
-2000-04-19 Eskil Heyn Olsen <deity@eskil.dk>
-
- * gnome-pilot.m4 (PILOT_LIBS): Changed the error string for gnome-pilot
- (PILOT_LIBS): Fixes the gnome-config check
-
-2000-04-10 Dan Winship <danw@helixcode.com>
-
- * gnome-pilot.m4 (PILOT_LIBS): Fix a bug introduced in the
- gnome-pilot-config to "gnome-config gpilot" change that caused not
- having pilot-link installed to become a fatal error.
-
-2000-02-26 James Henstridge <james@daa.com.au>
-
- * gnome-gettext.m4: fix up check of LINGUAS variable so that we don't
- get problems when LINGUAS contains `en' and ALL_LINGUAS contains
- `en_GB' for instance.
-
-2000-02-22 Martin Baulig <martin@home-of-linux.org>
-
- * autogen.sh: Don't run libtoolize when `NO_LIBTOOLIZE' is set.
-
-2000-02-09 Raja R Harinath <harinath@cs.umn.edu>
-
- * autogen.sh: Fix GNUism introduced in the previous fix.
-
-2000-02-08 Miguel de Icaza <miguel@gnu.org>
-
- * autogen.sh: Handle non GNU find programs.
-
2000-02-05 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-types.m4 (AC_LIBGTOP_CHECK_TYPE): New macro. This
@@ -282,95 +7,10 @@ Sun Apr 23 12:15:14 2000 George Lebl <jirka@5z.com>
(GNOME_LIBGTOP_TYPES): Check for <sys/bitypes.h> for Tru64 and
use AC_LIBGTOP_CHECK_TYPE rather than AC_CHECK_TYPE.
-2000-01-26 Dave Camp <campd@oit.edu>
-
- * gnome-bonobo-check.m4 Include <bonobo.h> rather than
- <bonobo/gnome-object.h>
-
-2000-01-26 Dave Camp <campd@oit.edu>
-
- * gnome-bonobo-check.m4: Check for bonobo_object_get_type() rather
- than gnome_object_get_type().
-
-2000-01-23 Peter Teichman <peter@helixcode.com>
-
- * gnome-pilot.m4: i broke the version-checking macro for other
- distribs in my last commit. fixing that now.
-
-2000-01-22 Peter Teichman <peter@helixcode.com>
-
- * gnome-pilot.m4 (PILOT_LIBS): fix the version-checking macro for
- debian
-
-2000-01-20 Raja R Harinath <harinath@cs.umn.edu>
-
- * gnome-objc-checks.m4: Look for sched_yield in -lrt, too.
- Suggested by Drazen Kazar <dave@srce.hr>.
-
-2000-01-16 Vadim Strizhevsky <vadim@optonline.net>
-
- * gnome-pilot.m4: Fix typo in PILOT_LINK_HOOK.
-
-2000-01-15 Eskil Heyn Olsen <deity@eskil.dk>
-
- * gnome-pilot.m4: PILOT_LINK_HOOK now check pilot-link version.
- GNOME_PILOT_CHECK defaults to requiring 0.9.3.
-
-2000-01-09 Martin Baulig <martin@home-of-linux.org>
-
- * gnome-libgtop-check.m4: Applied patch from R. Bernstein
- <rocky@panix.com> - print a better error message when
- LibGTop's major version number mismatches.
-
-1999-12-25 Martin Baulig <martin@home-of-linux.org>
-
- * gnome-pilot.m4: Applied patch from Colin Walters to make
- it compile under Debian GNU/Linux.
-
-1999-12-05 Martin Baulig <martin@home-of-linux.org>
-
- * gnome-libgtop-checks.m4: Removed all guile variables.
-
-1999-11-18 Jeff Garzik <jgarzik@mandrakesoft.com>
-
- * gnome-xml-check.m4: Better scoping of below fix.
-
-1999-11-16 Jeff Garzik <jgarzik@mandrakesoft.com>
-
- * gnome-xml-check.m4: always AC_SUBST GNOME_XML_LIB, so that
- output variable will always be present.
-
-1999-11-09 Eskil Heyn Olsen <deity@eskil.dk>
-
- * gnome-pilot.m4: uses test -r instead of test -e, was reported as
- a portability bug wrt solaris.
-
-1999-10-31 Eskil Heyn Olsen <deity@eskil.dk>
-
- * gnome-pilot.m4: added PILOT_LINK_CHECK, used by
- GNOME_PILOT_CHECK. Adds --with-pisock=$dir_for_pilot_link.
-
-1999-10-24 Jacob Berkman <jberkman@andrew.cmu.edu>
-
- * gnome-ghttp-check.m4: this should be a better fix
-
-1999-10-21 Jacob Berkman <jberkman@andrew.cmu.edu>
-
- * gnome-ghttp-check.m4: use a temp value until we know that
- ghttp exists. This will hopefully fix building on Solaris
- machines
-
-1999-09-26 Jody Goldberg <jgoldberg@home.com>
-
- * compiler-flags.m4 : Remove -Wpointer-arith. It generates large
- numbers of warnings under glibc2.1.2 with a recent egcs release.
- The glibc maintainers have suggested removing this flag because it
- is useless.
-
1999-09-01 Havoc Pennington <hp@pobox.com>
* gnome-xml-check.m4: If you're going to AC_PATH_PROG then use the
- prog you find :-)
+ prog you find :-)
1999-08-02 Peter Teichman <pat4@acpub.duke.edu>
@@ -568,7 +208,7 @@ Tue Feb 16 19:35:42 1999 Owen Taylor <otaylor@redhat.com>
* gnome-libgtop-check.m4: All parts of GNOME will now require
LibGTop >= 0.99.0 which is the latest version from CVS and
already feature-freezed for GNOME 1.0.
-
+
1998-12-09 Martin Baulig <martin@home-of-linux.org>
* aclocal-include.m4 (AM_ACLOCAL_INCLUDE): Make this work
@@ -638,7 +278,7 @@ Sat Dec 5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
* gnome-libgtop-sysdeps.m4: We need to check for <net/if_var.h>
and conditionally include it before <net/if_isppp.h> in the code
that check for I4B to make it work on FreeBSD 3.0.
-
+
1998-10-25 Marius Vollmer <mvo@zagadka.ping.de>
* gnome-guile-checks.m4: Add GUILE_LIBS to LIBS when checking
@@ -660,7 +300,7 @@ Sat Dec 5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
Gnorba info, if it is in a different location.
* Makefile.am (MACROS): Add gnome-gnorba-check.m4 to Makefile.
-
+
* gnome-gnorba-check.m4: New file.
1998-11-12 Raja R Harinath <harinath@cs.umn.edu>
@@ -701,7 +341,7 @@ Sat Dec 5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
included in "link". Use "compile" instead of "info includedir". Do
not include "1.2" in error message when Guile can't be found at
all.
-
+
1998-10-11 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Added optional
@@ -733,7 +373,7 @@ Sat Dec 5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
* compiler-flags.m4 (--enable-warn-unused): New configure parameter
to add `-Wunused' to the warning flags.
-
+
1998-09-27 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-check.m4: Make it require libgtop >= 0.26.2.
@@ -788,7 +428,7 @@ Sat Dec 5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Make it work
with a brain-dead /bin/sh and a brain-dead /bin/test.
-
+
* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Use `AC_MSG_WARN'
if LibGTop cannot be found and the `fail' argument is not given.
@@ -826,7 +466,7 @@ Sat Dec 5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
* gnome-libgtop-check.m4: make it require libgtop >= 0.25.0.
Added (AC_SUBST): `LIBGTOP_MICRO_VERSION' and `LIBGTOP_EXTRA_LIBS'.
-
+
1998-08-17 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-check.m4: Completely rewrote this file. It
@@ -973,7 +613,7 @@ Fri Jun 26 14:36:08 1998 Scott D. Heavner <sdh@po.cwru.edu>
This needs to be further cleaned up to only list what is
needed for gdiskfree.
* Makefile.am (MACROS): Add gnome-fileutils.m4.
-
+
1998-06-14 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-sysdeps.m4 (LINUX_TABLE): New automake conditional;
@@ -991,7 +631,7 @@ Fri Jun 26 14:36:08 1998 Scott D. Heavner <sdh@po.cwru.edu>
* gnome-support.m4 (AC_PROG_AWK): Look for awk.
(CROSS_COMPILING): Remove conditional.
-
+
Wed Jun 10 14:19:39 EDT 1998 Gregory McLean <gregm@comstar.net>
* gnome-x-checks.m4: More tweeks to make building against gtk 1.0
@@ -1058,7 +698,7 @@ Fri Apr 24 16:43:38 1998 Owen Taylor <otaylor@gtk.org>
ACLOCAL_FLAGS to aclocal. This allows, for instance,
ACLOCAL_FLAGS="-I /home/owen/share/aclocal/" autogen.sh
-
+
Sun Apr 19 01:35:53 EDT 1998 Gregory McLean <gregm@comstar.net>
* gnome-x-checks.m4: Updated the gtk check to check for 1.0.0.
@@ -1083,7 +723,7 @@ Thu Mar 19 23:23:30 1998 Tom Tromey <tromey@cygnus.com>
* gnome.m4 (GNOME_INIT_HOOK): Provide a way to hook some code to
execute; Accept a probe mode.
-
+
(GNOME_INIT): Define in terms of GNOME_INIT_HOOK.
Thu Mar 19 00:17:46 1998 Tom Tromey <tromey@cygnus.com>
@@ -1172,7 +812,7 @@ Fri Feb 27 10:05:34 1998 Tom Tromey <tromey@cygnus.com>
* gnome-x-checks.m4: Add `AC_DEFINE(HAVE_LIBSM)' if `-lSM' is
already part of `$x_libs'.
Move pthread check to new file.
-
+
Sat Feb 14 12:45:35 1998 Tom Tromey <tromey@cygnus.com>
* Makefile.am (macros.dep): Use single quotes, not double quotes.
@@ -1224,7 +864,7 @@ Sat Feb 14 01:09:37 1998 Tom Tromey <tromey@cygnus.com>
here, and renamed macro to GNOME_CHECK_GNOME.
* gnome-x-checks.m4: Likewise, move and renaming AC_GNOME_X_CHECKS
to GNOME_X_CHECKS.
-
+
* aclocal-include.m4: New file. Defines AM_ACLOCAL_INCLUDE macro
to provide extra search directories to `aclocal'.
diff --git a/macros/Makefile.am b/macros/Makefile.am
index f9a0e2b3..e03dbeed 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,18 +1,17 @@
## Please update this variable if any new macros are created
-
MACROS= \
aclocal-include.m4 \
compiler-flags.m4 \
curses.m4 \
gnome-bonobo-check.m4 \
gnome-fileutils.m4 \
+ gnome-gettext.m4 \
gnome-ghttp-check.m4 \
gnome-gnorba-check.m4 \
gnome-guile-checks.m4 \
gnome-libgtop-check.m4 \
gnome-objc-checks.m4 \
gnome-orbit-check.m4 \
- gnome-pilot.m4 \
gnome-print-check.m4 \
gnome-pthread-check.m4 \
gnome-support.m4 \
@@ -21,23 +20,21 @@ MACROS= \
gnome-x-checks.m4 \
gnome-xml-check.m4 \
gnome.m4 \
- gperf-check.m4 \
linger.m4 \
- need-declaration.m4
+ need-declaration.m4
-EXTRA_DIST=$(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh
+EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh
MAINTAINERCLEANFILES=macros.dep
@MAINT@macros.dep: Makefile.am
@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@
if INSIDE_GNOME_COMMON
-gnome_aclocaldir = $(datadir)/aclocal/gnome-macros
+gnome_aclocaldir = $(datadir)/aclocal/gnome
gnome-macros.dep: Makefile.am
@echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@
-gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 \
- gnome-gettext.m4 autogen.sh
+gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh
endif
diff --git a/macros/aclocal-include.m4 b/macros/aclocal-include.m4
index 43f9dbc4..abf6533f 100644
--- a/macros/aclocal-include.m4
+++ b/macros/aclocal-include.m4
@@ -8,7 +8,7 @@
dnl AM_ACLOCAL_INCLUDE(macrodir)
AC_DEFUN([AM_ACLOCAL_INCLUDE],
[
- AM_CONDITIONAL(INSIDE_GNOME_COMMON, false)
+ AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y)
test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 4f57a71a..70273913 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -3,75 +3,49 @@
DIE=0
-if [ -n "$GNOME2_PATH" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS"
- PATH="$GNOME2_PATH/bin:$PATH"
- export PATH
-fi
-
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME."
+ echo "**Error**: You must have \`autoconf' installed to compile Gnome."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
- echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+ (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`libtool' installed to compile Gnome."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
}
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
- (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`xml-i18n-toolize' installed to compile $PKG_NAME."
- echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/xml-i18n-tools/xml-i18n-tools-0.9.tar.gz"
- echo "(or a newer version of xml-i18n-tools or intltool if it is available)"
+grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
+ grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+ (gettext --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`gettext' installed to compile Gnome."
+ echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
+ echo "(or a newer version if it is available)"
DIE=1
}
}
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
+grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
+ grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+ (gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
- echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+ echo "**Error**: You must have \`gettext' installed to compile Gnome."
+ echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
}
-#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-# (gettext --version) < /dev/null > /dev/null 2>&1 || {
-# echo
-# echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
-# echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
-# echo "(or a newer version if it is available)"
-# DIE=1
-# }
-#}
-
-#grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
-# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-# (gettext --version) < /dev/null > /dev/null 2>&1 || {
-# echo
-# echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
-# echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
-# echo "(or a newer version if it is available)"
-# DIE=1
-# }
-#}
-
-(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || {
+(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
+ echo "**Error**: You must have \`automake' installed to compile Gnome."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
@@ -80,7 +54,7 @@ fi
# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal-1.4 --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: Missing \`aclocal'. The version of \`automake'"
echo "installed doesn't appear recent enough."
@@ -114,28 +88,12 @@ do
echo processing $dr
macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
( cd $dr
- macrosdir=`find . -name macros -print`
- for i in $macrodirs; do
- if test -f $i/gnome-gettext.m4; then
- DELETEFILES="$DELETEFILES $i/gnome-gettext.m4"
- fi
- done
-
- echo "deletefiles is $DELETEFILES"
aclocalinclude="$ACLOCAL_FLAGS"
- for k in $aclocalinclude; do
- if test -d $k; then
- if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
- rm -f $DELETEFILES
- fi
- fi
- done
for k in $macrodirs; do
if test -d $k; then
aclocalinclude="$aclocalinclude -I $k"
- if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
- rm -f $DELETEFILES
- fi
+ ##else
+ ## echo "**Warning**: No such directory \`$k'. Ignored."
fi
done
if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
@@ -158,41 +116,21 @@ do
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
- echo "Running intltoolize..."
- intltoolize --copy --force --automake
- fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
- echo "Running xml-i18n-toolize..."
- xml-i18n-toolize --copy --force --automake
- fi
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
- libtoolize --force --copy
- fi
+ echo "Running libtoolize..."
+ libtoolize --force --copy
fi
- echo "Running aclocal-1.4 $aclocalinclude ..."
- aclocal-1.4 $aclocalinclude || {
- echo
- echo "**Error**: aclocal-1.4 failed. This may mean that you have not"
- echo "installed all of the packages you need, or you may need to"
- echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
- echo "for the prefix where you installed the packages whose"
- echo "macros were not found"
- exit 1
- }
-
+ echo "Running aclocal $aclocalinclude ..."
+ aclocal $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
- autoheader || { echo "**Error**: autoheader failed."; exit 1; }
+ autoheader
fi
- echo "Running automake-1.4 --gnu $am_opt ..."
- automake-1.4 --add-missing --gnu $am_opt ||
- { echo "**Error**: automake-1.4 failed."; exit 1; }
+ echo "Running automake --gnu $am_opt ..."
+ automake --add-missing --gnu $am_opt
echo "Running autoconf ..."
- autoconf || { echo "**Error**: autoconf failed."; exit 1; }
- ) || exit 1
+ autoconf
+ )
fi
done
diff --git a/macros/compiler-flags.m4 b/macros/compiler-flags.m4
index 63f8e2e6..278d5099 100644
--- a/macros/compiler-flags.m4
+++ b/macros/compiler-flags.m4
@@ -21,7 +21,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
## -W is not all that useful. And it cannot be controlled
## with individual -Wno-xxx flags, unlike -Wall
if test "x$enable_compile_warnings" = "xyes"; then
- warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations"
+ warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith"
fi
fi
fi
@@ -75,7 +75,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
## -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 -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual"
+ warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wshadow -Woverloaded-virtual"
fi
fi
fi
diff --git a/macros/gnome-bonobo-check.m4 b/macros/gnome-bonobo-check.m4
index daa109c0..65e272cf 100644
--- a/macros/gnome-bonobo-check.m4
+++ b/macros/gnome-bonobo-check.m4
@@ -41,8 +41,8 @@ AC_ARG_ENABLE(bonobotest, [ --disable-bonobotest Do not try to compile an
if test "$GNOME_CONFIG" = "no" ; then
no_bonobo=yes
else
- BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox`
- BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo bonobox`
+ BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo`
+ BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo`
bonobo_major_version=`$GNOME_CONFIG $bonobo_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
@@ -64,7 +64,7 @@ dnl
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <bonobo.h>
+#include <bonobo/gnome-object.h>
static char*
my_strdup (char *str)
@@ -88,7 +88,7 @@ int main ()
char *tmp_version;
system ("touch conf.bonobotest");
- bonobo_object_get_type ();
+ gnome_object_get_type ();
return 0;
}
@@ -148,19 +148,3 @@ AC_DEFUN([BONOBO_CHECK], [
AM_PATH_BONOBO(0.1.0,,[AC_MSG_ERROR(BONOBO not found)])
])
-AC_DEFUN([AM_BONOBO_USES_OAF],
-[
- AC_REQUIRE([AM_PATH_BONOBO])
-
- AC_MSG_CHECKING(if Bonobo uses OAF)
- if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then
- using_oaf="yes"
- AC_DEFINE(BONOBO_USES_OAF)
- else
- using_oaf="no"
- fi
-
- AC_MSG_RESULT("$using_oaf")
-
- AM_CONDITIONAL(BONOBO_USES_OAF, test x"using_oaf" = "xyes")
-])
diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4
index 102351cf..1086d30a 100644
--- a/macros/gnome-guile-checks.m4
+++ b/macros/gnome-guile-checks.m4
@@ -6,18 +6,6 @@ dnl
AC_DEFUN([GNOME_CHECK_GUILE],
[
-dnl AC_MSG_WARN([Withval is: $withval])
- guile_msg = 'Huh?'
-if test x$withval = xno ; then
- guile_msg = 'disabled'
- GUILE_LIBS=
- GUILE_INCS=
- AC_SUBST(GUILE_LIBS)
- AC_SUBST(GUILE_INCS)
- AM_CONDITIONAL(GUILE, /bin/false)
-else
- guile_msg="no"
-
saved_ldflags="$LDFLAGS"
saved_cppflags="$CPPFLAGS"
LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
@@ -112,8 +100,6 @@ else
])
AC_MSG_RESULT($ac_cv_guile_found)
- guile_msg=$ac_cv_guile_found
-
if test x$ac_cv_guile_found = xno ; then
if test x$1 = xfail ; then
AC_MSG_ERROR(Can not find Guile on this system)
@@ -130,5 +116,4 @@ else
AC_SUBST(GUILE_LIBS)
AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes)
-fi
])
diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4
index 1b4e1745..03871927 100644
--- a/macros/gnome-libgtop-check.m4
+++ b/macros/gnome-libgtop-check.m4
@@ -6,7 +6,7 @@ dnl that we need to #include some other header files on some
dnl systems to get some types.
dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
-AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
+AC_DEFUN(AC_LIBGTOP_CHECK_TYPE,
[AC_REQUIRE([AC_HEADER_STDC])dnl
AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(ac_cv_type_$1,
@@ -40,7 +40,7 @@ AC_DEFUN([GNOME_LIBGTOP_TYPES],
[
AC_CHECK_HEADERS(sys/bitypes.h)
AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
- AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
+ AC_LIBGTOP_CHECK_TYPE(int64_t, long long int)
])
dnl
@@ -61,6 +61,10 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
AC_SUBST(LIBGTOP_INCS)
AC_SUBST(LIBGTOP_NAMES_LIBS)
AC_SUBST(LIBGTOP_NAMES_INCS)
+ AC_SUBST(LIBGTOP_GUILE_INCS)
+ AC_SUBST(LIBGTOP_GUILE_LIBS)
+ AC_SUBST(LIBGTOP_GUILE_NAMES_INCS)
+ AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS)
AC_SUBST(LIBGTOP_MAJOR_VERSION)
AC_SUBST(LIBGTOP_MINOR_VERSION)
AC_SUBST(LIBGTOP_MICRO_VERSION)
@@ -149,13 +153,10 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
libgtop_micro_version=`$LIBGTOP_CONFIG --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test $libgtop_major_version != $min_libgtop_major ; then
- no_libgtop=mismatch
- else
- test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
- if test $libgtop_minor_version = $min_libgtop_minor ; then
- test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
- fi
+ test $libgtop_major_version != $min_libgtop_major && no_libgtop=yes
+ test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
+ if test $libgtop_minor_version = $min_libgtop_minor ; then
+ test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
fi
. $configfile
fi
@@ -172,9 +173,6 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
ifelse([$2], [], :, [$2])
else
AC_MSG_RESULT(no)
- if test "$no_libgtop"x = mismatchx; then
- AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major)
- fi
if test "x$3" = "xfail"; then
AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found)
else
diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index eb1b3d63..a497b51a 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -3,211 +3,36 @@ dnl GNOME_PILOT_HOOK(script if found, fail)
dnl if fail = "failure", abort if gnome-pilot not found
dnl
-dnl
-dnl
-
-GNOME_PILOT_CFLAGS=
-GNOME_PILOT_LIBS=
-PISOCK_CFLAGS=
-PISOCK_LIBS=
-
-AC_SUBST(GNOME_PILOT_CFLAGS)
-AC_SUBST(GNOME_PILOT_LIBS)
-AC_SUBST(PISOCK_CFLAGS)
-AC_SUBST(PISOCK_LIBS)
-
-AC_DEFUN([PILOT_LINK_HOOK],[
- AC_ARG_WITH(pisock,
- [ --with-pisock Specify prefix for pisock files],[
- if test x$withval = xyes; then
- dnl Note that an empty true branch is not valid sh syntax.
- ifelse([$1], [], :, [$1])
- else
- PISOCK_CFLAGS="-I$withval/include"
- incdir="$withval/include"
- PISOCK_LIBS="-L$withval/lib -lpisock -lpisync"
- AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
- if test -r $withval/lib/libpisock.so; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.])
- fi
- fi
- ])
-
- if test x$PISOCK_CFLAGS = x; then
- AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [
- AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock"
- piversion_include="libpisock/pi-version.h"
- incdir="/usr/include/libpisock"
- ], [
- AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock"
- piversion_include="$prefix/include/pi-version.h"
- if test x$PISOCK_LIBDIR = x; then
- incdir="$prefix/include"
- PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync"
- fi ],
- AC_MSG_ERROR([Unable to find pi-version.h]))
- ])
- ])
- fi
-
- if test "x$PISOCK_LIBS" = "x"; then
- AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock -lpisync"],
- [ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ])
- fi
-
- AC_ARG_ENABLE(pilotlinktest,
- [ --enable-pilotlinktest Test for correct version of pilot-link],
- [testplversion=$enableval],
- [ testplversion=yes ]
- )
-
- if test x$piversion_include = x; then
- piversion_include="pi-version.h"
- fi
-
- pi_version=`cat $incdir/pi-version.h|grep PILOT_LINK_VERSION|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'`
- pi_major=`cat $incdir/pi-version.h|grep PILOT_LINK_MAJOR|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'`
- pi_minor=`cat $incdir/pi-version.h|grep PILOT_LINK_MINOR|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'`
- pi_patch=`cat $incdir/pi-version.h|grep PILOT_LINK_PATCH|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'`
-
- PILOT_LINK_VERSION="$pi_version.$pi_major.$pi_minor$pi_patch"
-
- if test x$testplversion = xyes; then
- AC_MSG_CHECKING([for pilot-link version >= $1])
- pl_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- CFLAGS_save="$CFLAGS"
- CFLAGS="$CFLAGS $PISOCK_CFLAGS"
- AC_TRY_RUN(
- [
- #include <$piversion_include>
- int main(int argc,char *argv[]) {
- if (PILOT_LINK_VERSION == $pl_ve) {
- if (PILOT_LINK_MAJOR == $pl_ma) {
- if (PILOT_LINK_MINOR >= $pl_mi) {
- return 0;
- }
- } else if (PILOT_LINK_MAJOR > $pl_ma) {
- return 0;
- }
- } else if (PILOT_LINK_VERSION > $pl_ve) {
- return 0;
- }
- return 1;
- }
- ],
- [AC_MSG_RESULT([yes (found $PILOT_LINK_VERSION)])],
- [AC_MSG_ERROR([pilot-link >= $1 required])],
- [AC_MSG_WARN([No action taken for crosscompile])]
- )
- CFLAGS="$CFLAGS_save"
- fi
-
- unset piversion_include
- unset pi_verion
- unset pi_major
- unset pi_minor
- unset pi_patch
- unset incdir
- unset pl_mi
- unset pl_ma
- unset pl_ve
-])
-
-AC_DEFUN([PILOT_LINK_CHECK],[
- PILOT_LINK_HOOK($1,[],nofailure)
-])
-
AC_DEFUN([GNOME_PILOT_HOOK],[
- AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+ AC_PATH_PROG(GNOME_PILOT_CONFIG,gnome-pilot-config,no)
AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
- if test "x$GNOME_CONFIG" = "xno"; then
+ if test x$GNOME_PILOT_CONFIG = xno; then
gnome_cv_pilot_found=no
else
- # gnome-config doesn't return a useful error status,
- # so we check if it outputs anything to stderr
- if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
- gnome_cv_pilot_found=yes
- else
- gnome_cv_pilot_found=no
- fi
+ gnome_cv_pilot_found=yes
fi
])
- if test x$gnome_cv_pilot_found = xyes; then
- if test x$1 != x; then
- gpv_pre_found=`$GNOME_CONFIG --modversion gpilot`
- gpv_found=`echo $gpv_pre_found | sed 's/gnome-pilot-\(.*\)/\1/'`
- AC_MSG_CHECKING([gnome-pilot version ($1)])
- gpv_major=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gpv_minor=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gpv_patch=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- gpv_ma=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gpv_mi=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gpv_pa=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- if test $gpv_major -eq $gpv_ma; then
- if test $gpv_minor -eq $gpv_mi; then
- if test $gpv_patch -ge $gpv_pa; then
- AC_MSG_RESULT([yes (found $gpv_found)])
- else
- AC_MSG_RESULT([too old (found $gpv_found)])
- gnome_cv_pilot_found=no
- fi
- elif test $gpv_minor -gt $gpv_mi; then
- AC_MSG_RESULT([yes (found $gpv_found)])
- else
- AC_MSG_RESULT([too old (found $gpv_found)])
- gnome_cv_pilot_found=no
- fi
- else
- AC_MSG_RESULT([major version mismatch (found $gpv_found)])
- gnome_cv_pilot_found=no
- fi
- unset gpv_pre_found
- unset gpv_found
- unset gpv_major
- unset gpv_minor
- unset gpv_patch
- unset gpv_ma
- unset gpv_mi
- unset gpv_pa
- fi
- fi
-
AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)
if test x$gnome_cv_pilot_found = xyes; then
- PILOT_LINK_CHECK($2)
- GNOME_PILOT_CFLAGS=`gnome-config --cflags gpilot`
- GNOME_PILOT_LIBS=`gnome-config --libs gpilot`
+ $1
+ AC_CHECK_HEADER(pi-version.h, [PISOCK_INCLUDEDIR=""], [
+ AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_INCLUDEDIR="-I/usr/include/libpisock"])])
+ AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock" ])
+ GNOME_PILOT_CFLAGS=`gnome-pilot-config --cflags client conduitmgmt`
+ GNOME_PILOT_LIBS=`gnome-pilot-config --libs client conduitmgmt`
+ AC_SUBST(GNOME_PILOT_CFLAGS)
+ AC_SUBST(GNOME_PILOT_LIBS)
+ AC_SUBST(PISOCK_INCLUDEDIR)
+ AC_SUBST(PISOCK_LIBS)
+ AC_SUBST(PILOT_BINS)
+ AC_SUBST(PILOT_LIBS)
else
- if test x$3 = xfail; then
- AC_MSG_ERROR([gnome-pilot development package not installed or installation problem])
- else
- AC_MSG_WARN([gnome-pilot development package not installed or installation problem])
+ if test x$2 = xfailure; then
+ AC_MSG_ERROR(Gnome-pilot not installed or installation problem)
fi
fi
])
AC_DEFUN([GNOME_PILOT_CHECK],[
- if test x$1 = x; then
- gpv=[]
- else
- gpv=$1
- fi
- if test x$2 = x; then
- plv=0.11.4
- else
- plv=$2
- fi
- if test x$3 = x; then
- good=[]
- else
- good=$3
- fi
-
- GNOME_PILOT_HOOK($gpv, $plv, $good)
+ GNOME_PILOT_HOOK([],nofailure)
])
-
diff --git a/macros/gnome-print-check.m4 b/macros/gnome-print-check.m4
index 968fcc01..7d98281d 100644
--- a/macros/gnome-print-check.m4
+++ b/macros/gnome-print-check.m4
@@ -8,56 +8,164 @@
dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS
dnl
-AC_DEFUN([AM_PATH_GNOME_PRINT],
-[
- min_version=ifelse([$1],,0.21,$1)
+AC_DEFUN(AM_PATH_GNOME_PRINT,
+[dnl
+dnl Get the cflags and libraries from the gnome-config script
+dnl
+AC_ARG_WITH(gnome-print-prefix,[ --with-gnome-print-prefix=PFX Prefix where GNOME-PRINT is installed (optional)],
+ gnome_print_prefix="$withval", gnome_print_prefix="")
+AC_ARG_WITH(gnome-print-exec-prefix,[ --with-gnome-print-exec-prefix=PFX Exec prefix where GNOME-PRINT is installed (optional)],
+ gnome_print_exec_prefix="$withval", gnome_print_exec_prefix="")
+AC_ARG_ENABLE(gnome-printtest, [ --disable-gnome-printtest Do not try to compile and run a test GNOME-PRINT program],
+ , enable_gnome_printtest=yes)
- gnome_print_ok=""
+ if test x$gnome_print_exec_prefix != x ; then
+ gnome_print_args="$gnome_print_args --exec-prefix=$gnome_print_exec_prefix"
+ if test x${GNOME_CONFIG+set} != xset ; then
+ GNOME_CONFIG=$gnome_print_exec_prefix/bin/gnome-config
+ fi
+ fi
+ if test x$gnome_print_prefix != x ; then
+ gnome_print_args="$gnome_print_args --prefix=$gnome_print_prefix"
+ if test x${GNOME_CONFIG+set} != xset ; then
+ GNOME_CONFIG=$gnome_print_prefix/bin/gnome-config
+ fi
+ fi
AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+ min_gnome_print_version=ifelse([$1], ,0.1.0,$1)
+ AC_MSG_CHECKING(for GNOME-PRINT - version >= $min_gnome_print_version)
+ no_gnome_print=""
if test "$GNOME_CONFIG" = "no" ; then
- AC_MSG_RESULT(gnome-config is missing, check your gnome installation)
+ no_gnome_print=yes
else
- AC_MSG_CHECKING(for GNOME-PRINT - version >= $min_version)
- if `$GNOME_CONFIG --libs print > /dev/null 2>&1`; then
- rqmajor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- rqminor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- major=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- minor=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- if test "$major" -ge "$rqmajor"; then
- if test "$major" -gt "$rqmajor"; then
- AC_MSG_RESULT("found $major.$minor")
- gnome_print_ok="yes"
- else
- if test "$minor" -ge "$rqminor"; then
- AC_MSG_RESULT("found $major.$minor")
- gnome_print_ok="yes"
- else
- AC_MSG_RESULT("you have $major.$minor")
- fi
- fi
- else
- AC_MSG_RESULT("you have $major.$minor")
- fi
- else
- AC_MSG_RESULT("did not find any version")
- fi
- fi
+ GNOME_PRINT_CFLAGS=`$GNOME_CONFIG $gnome_printconf_args --cflags print`
+ GNOME_PRINT_LIBS=`$GNOME_CONFIG $gnome_printconf_args --libs print`
- if test "x$gnome_print_ok" != "x" ; then
- GNOME_PRINT_CFLAGS=`$GNOME_CONFIG --cflags print`
- GNOME_PRINT_LIBS=`$GNOME_CONFIG --libs print`
- ifelse([$2], , :, [$2])
+ gnome_print_major_version=`$GNOME_CONFIG $gnome_print_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gnome_print_minor_version=`$GNOME_CONFIG $gnome_print_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gnome_print_micro_version=`$GNOME_CONFIG $gnome_print_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gnome_printtest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GNOME_PRINT_CFLAGS"
+ LIBS="$LIBS $GNOME_PRINT_LIBS"
+dnl
+dnl Now check if the installed GNOME-PRINT is sufficiently new. (Also sanity
+dnl checks the results of gnome-config to some extent
+dnl
+ rm -f conf.gnome_printtest
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libgnomeprint/gnome-print.h>
+
+static char*
+my_strdup (char *str)
+{
+ char *new_str;
+
+ if (str)
+ {
+ new_str = malloc ((strlen (str) + 1) * sizeof(char));
+ strcpy (new_str, str);
+ }
else
+ new_str = NULL;
+
+ return new_str;
+}
+
+int main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.gnome_printtest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = my_strdup("$min_gnome_print_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+ printf("%s, bad version string\n", "$min_gnome_print_version");
+ exit(1);
+ }
+ return 0;
+#if 0
+ if (($gnome_print_major_version > major) ||
+ (($gnome_print_major_version == major) && ($gnome_print_minor_version > minor)) ||
+ (($gnome_print_major_version == major) && ($gnome_print_minor_version == minor) && ($gnome_print_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** 'gnome-config print --version' returned %d.%d.%d, but the minimum version\n", $gnome_print_major_version, $gnome_print_minor_version, $gnome_print_micro_version);
+ printf("*** of GNOME-PRINT required is %d.%d.%d. If gnome-config is correct, then it is\n", major, minor, micro);
+ printf("*** best to upgrade to the required version.\n");
+ printf("*** If gnome-config was wrong, set the environment variable GNOME_CONFIG\n");
+ printf("*** to point to the correct copy of gnome-config, and remove the file\n");
+ printf("*** config.cache before re-running configure\n");
+ return 1;
+ }
+#endif
+}
+
+],, no_gnome_print=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gnome_print" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$GNOME_CONFIG" = "no" ; then
+ echo "*** The gnome-config script installed by GNOME-LIBS could not be found"
+ echo "*** If GNOME-PRINT was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the GNOME_CONFIG environment variable to the"
+ echo "*** full path to gnome-config."
+ else
+ if test -f conf.gnome_printtest ; then
+ :
+ else
+ echo "*** Could not run GNOME-PRINT test program, checking why..."
+ CFLAGS="$CFLAGS $GNOME_PRINT_CFLAGS"
+ LIBS="$LIBS $GNOME_PRINT_LIBS"
+ AC_TRY_LINK([
+#include <stdio.h>
+#include <libgnomeprint/gnome-print.h>
+], [ return 0; ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GNOME-PRINT or finding the wrong"
+ echo "*** version of GNOME-PRINT. If it is not finding GNOME-PRINT, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GNOME-PRINT was incorrectly installed"
+ echo "*** or that you have moved GNOME-PRINT since it was installed. In the latter case, you"
+ echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
GNOME_PRINT_CFLAGS=""
GNOME_PRINT_LIBS=""
ifelse([$3], , :, [$3])
fi
-
AC_SUBST(GNOME_PRINT_CFLAGS)
AC_SUBST(GNOME_PRINT_LIBS)
+ rm -f conf.gnome_printtest
])
AC_DEFUN([GNOME_PRINT_CHECK], [
- AM_PATH_GNOME_PRINT($1,,[AC_MSG_ERROR(GNOME-PRINT not found or wrong version)])
+ AM_PATH_GNOME_PRINT(0.1.0,,[AC_MSG_ERROR(GNOME-PRINT not found)])
])
diff --git a/macros/gnome-vfs.m4 b/macros/gnome-vfs.m4
index 6dce3077..137a39dd 100644
--- a/macros/gnome-vfs.m4
+++ b/macros/gnome-vfs.m4
@@ -48,13 +48,7 @@ AC_DEFUN([GNOME_WITH_VFS],[
])])
AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport)
dnl add for source routing support setsockopt
- AC_CHECK_HEADERS(rpc/pmap_clnt.h, , , [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
- ])
+ AC_CHECK_HEADERS(rpc/pmap_clnt.h)
vfs_flags="$vfs_flags, mcfs, ftpfs, fish"
use_net_code=true
fi
@@ -66,7 +60,7 @@ AC_DEFUN([GNOME_WITH_VFS],[
SAMBAFILES=""
AC_ARG_WITH(samba,
[--with-samba Support smb virtual file system],[
- if test "x$withval" != "xno"; then
+ if test "x$withval != xno"; then
AC_DEFINE(WITH_SMBFS)
vfs_flags="$vfs_flags, smbfs"
smbfs="smbfs.o"
diff --git a/macros/gnome-xml-check.m4 b/macros/gnome-xml-check.m4
index 1caad100..2410f35d 100644
--- a/macros/gnome-xml-check.m4
+++ b/macros/gnome-xml-check.m4
@@ -14,17 +14,15 @@ AC_DEFUN([GNOME_XML_HOOK],[
AC_MSG_ERROR(Could not find gnome-config)
fi
fi
- GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml`
- AC_SUBST(GNOME_XML_CFLAGS)
AC_CHECK_LIB(xml, xmlNewDoc, [
$1
+ AC_SUBST(GNOME_XML_LIB)
GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
], [
if test x$2 = xfailure; then
AC_MSG_ERROR(Could not link sample xml program)
fi
], `$GNOME_CONFIG --libs xml`)
- AC_SUBST(GNOME_XML_LIB)
])
AC_DEFUN([GNOME_XML_CHECK], [
diff --git a/macros/gnome.m4 b/macros/gnome.m4
index 2d23de87..a3a9ca74 100644
--- a/macros/gnome.m4
+++ b/macros/gnome.m4
@@ -104,10 +104,6 @@ AC_DEFUN([GNOME_INIT_HOOK],[
AC_SUBST(GNOME_APPLETS_LIBS)
GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
AC_MSG_RESULT($GNOME_APPLETS_LIBS);;
- docklets)
- AC_SUBST(GNOME_DOCKLETS_LIBS)
- GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
- AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);;
capplet)
AC_SUBST(GNOME_CAPPLET_LIBS)
GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`
@@ -115,8 +111,6 @@ AC_DEFUN([GNOME_INIT_HOOK],[
*)
AC_MSG_RESULT(unknown library)
esac
- EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i`
- GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR"
done
fi
])
View Lorry Controller Status