aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog85
-rw-r--r--macros/Makefile.am3
-rw-r--r--macros/autogen.sh19
-rw-r--r--macros/compiler-flags.m44
-rw-r--r--macros/gnome-bonobo-check.m44
-rw-r--r--macros/gnome-libgtop-check.m420
-rw-r--r--macros/gnome-pilot.m4114
-rw-r--r--macros/gnome-xml-check.m42
8 files changed, 29 insertions, 222 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index b752b6036c..33918c0368 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -7,91 +7,6 @@
(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
diff --git a/macros/Makefile.am b/macros/Makefile.am
index 2b7b6ebbc8..e03dbeed1a 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,11 +1,11 @@
## 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 \
@@ -20,7 +20,6 @@ MACROS= \
gnome-x-checks.m4 \
gnome-xml-check.m4 \
gnome.m4 \
- gperf-check.m4 \
linger.m4 \
need-declaration.m4
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 5662d01ff4..7027391368 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -3,12 +3,6 @@
DIE=0
-if [ -n "$GNOME2_PATH" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
- PATH="$GNOME2_DIR/bin:$PATH"
- export PATH
-fi
-
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`autoconf' installed to compile Gnome."
@@ -94,21 +88,12 @@ do
echo processing $dr
macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
( cd $dr
- DELETEFILES="`find . -name gnome-gettext.m4`"
aclocalinclude="$ACLOCAL_FLAGS"
- for k in $aclocalinclude; do
- if test -d $k; then
- if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1.0" ]; 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.0" ]; 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
diff --git a/macros/compiler-flags.m4 b/macros/compiler-flags.m4
index 63f8e2e6ac..278d5099c0 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 7eb2b2653d..65e272cf7a 100644
--- a/macros/gnome-bonobo-check.m4
+++ b/macros/gnome-bonobo-check.m4
@@ -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;
}
diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4
index 0ce6f6f612..038719276b 100644
--- a/macros/gnome-libgtop-check.m4
+++ b/macros/gnome-libgtop-check.m4
@@ -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 16e081a366..a497b51a39 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -3,99 +3,6 @@ dnl GNOME_PILOT_HOOK(script if found, fail)
dnl if fail = "failure", abort if gnome-pilot not found
dnl
-GNOME_PILOT_CFLAGS=
-GNOME_PILOT_LIBS=
-PISOCK_INCLUDEDIR=
-PISOCK_LIBS=
-PILOT_BINS=
-PILOT_LIBS=
-
-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)
-
-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_INCLUDEDIR="-I$withval/include"
- PISOCK_LIBDIR="-L$withval/lib"
- PISOCK_LIBS="-lpisock"
- 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 ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.")
- fi
- AC_SUBST(PISOCK_INCLUDEDIR)
- AC_SUBST(PISOCK_LIBDIR)
- fi
- ])
-
- if test x$PISOCK_INCLUDEDIR = x; then
- AC_CHECK_HEADER(pi-version.h, [], [
- AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_INCLUDEDIR="-I/usr/include/libpisock"
- piversion_include="libpisock/pi-version.h"],
- AC_MSG_ERROR("Unable to find pi-version.h")) ])
- fi
-
- AC_SUBST(PISOCK_INCLUDEDIR)
-
- if test x$PISOCK_LIBDIR = x; then
- AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ],
- [ AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") ])
- 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
-
- 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/'`
- 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) {
- exit(0);
- }
- } else if (PILOT_LINK_MAJOR > $pl_ma) {
- exit(0);
- }
- } else if (PILOT_LINK_VERSION > $pl_ve) {
- exit(0);
- }
- exit(1);
- }
- ],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_ERROR("pilot-link >= $1 required")],
- [AC_MSG_WARN("No action taken for crosscompile")]
- )
- fi
-])
-
-AC_DEFUN([PILOT_LINK_CHECK],[
- PILOT_LINK_HOOK($1,[],nofailure)
-])
-
AC_DEFUN([GNOME_PILOT_HOOK],[
AC_PATH_PROG(GNOME_PILOT_CONFIG,gnome-pilot-config,no)
AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
@@ -107,22 +14,25 @@ AC_DEFUN([GNOME_PILOT_HOOK],[
])
AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)
if test x$gnome_cv_pilot_found = xyes; then
- PILOT_LINK_CHECK($1)
+ $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`
- $2
+ 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 = xfailure; then
+ 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
- GNOME_PILOT_HOOK(0.9.3,[],nofailure)
- else
- GNOME_PILOT_HOOK($1,[],nofailure)
- fi
+ GNOME_PILOT_HOOK([],nofailure)
])
-
diff --git a/macros/gnome-xml-check.m4 b/macros/gnome-xml-check.m4
index 4bc91d124d..2410f35db7 100644
--- a/macros/gnome-xml-check.m4
+++ b/macros/gnome-xml-check.m4
@@ -16,13 +16,13 @@ AC_DEFUN([GNOME_XML_HOOK],[
fi
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], [
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 08:05:27 +0800