From 7926987a666745b4df6eefab3614c015fa677f33 Mon Sep 17 00:00:00 2001 From: asac Date: Wed, 21 Feb 2007 03:34:15 +0100 Subject: [PATCH] bzXXX-syntax fixes for .m4 files needed for proper embedding --- build/autoconf/altoptions.m4 | 20 ++++++++++---------- build/autoconf/freetype2.m4 | 2 +- build/autoconf/glib.m4 | 2 +- build/autoconf/gtk.m4 | 2 +- build/autoconf/libIDL-2.m4 | 2 +- build/autoconf/libIDL.m4 | 2 +- build/autoconf/libart.m4 | 2 +- build/autoconf/nspr.m4 | 2 +- build/autoconf/pkg.m4 | 2 +- directory/c-sdk/config/autoconf/nspr.m4 | 2 +- nsprpub/config/nspr.m4 | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/autoconf/altoptions.m4 b/build/autoconf/altoptions.m4 index aa58032..4d51340 100644 --- a/build/autoconf/altoptions.m4 +++ b/build/autoconf/altoptions.m4 @@ -55,7 +55,7 @@ dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file dnl MOZ_TWO_STRING_TEST(NAME, VAL, STR1, IF-STR1, STR2, IF-STR2 [, ELSE]) -AC_DEFUN(MOZ_TWO_STRING_TEST, +AC_DEFUN([MOZ_TWO_STRING_TEST], [if test "[$2]" = "[$3]"; then ifelse([$4], , :, [$4]) elif test "[$2]" = "[$5]"; then @@ -67,23 +67,23 @@ AC_DEFUN(MOZ_TWO_STRING_TEST, fi]) dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]]) -AC_DEFUN(MOZ_ARG_ENABLE_BOOL, +AC_DEFUN([MOZ_ARG_ENABLE_BOOL], [AC_ARG_ENABLE([$1], [$2], [MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4])], [$5])]) dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]]) -AC_DEFUN(MOZ_ARG_DISABLE_BOOL, +AC_DEFUN([MOZ_ARG_DISABLE_BOOL], [AC_ARG_ENABLE([$1], [$2], [MOZ_TWO_STRING_TEST([$1], [$enableval], no, [$3], yes, [$4])], [$5])]) dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE]) -AC_DEFUN(MOZ_ARG_ENABLE_STRING, +AC_DEFUN([MOZ_ARG_ENABLE_STRING], [AC_ARG_ENABLE([$1], [$2], [$3], [$4])]) dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]]) -AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING, +AC_DEFUN([MOZ_ARG_ENABLE_BOOL_OR_STRING], [ifelse([$5], , [errprint([Option, $1, needs an "IF-SET" argument. ]) @@ -93,19 +93,19 @@ AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING, [$6])])]) dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]) -AC_DEFUN(MOZ_ARG_WITH_BOOL, +AC_DEFUN([MOZ_ARG_WITH_BOOL], [AC_ARG_WITH([$1], [$2], [MOZ_TWO_STRING_TEST([$1], [$withval], yes, [$3], no, [$4])], [$5])]) dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]) -AC_DEFUN(MOZ_ARG_WITHOUT_BOOL, +AC_DEFUN([MOZ_ARG_WITHOUT_BOOL], [AC_ARG_WITH([$1], [$2], [MOZ_TWO_STRING_TEST([$1], [$withval], no, [$3], yes, [$4])], [$5])]) dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE]) -AC_DEFUN(MOZ_ARG_WITH_STRING, +AC_DEFUN([MOZ_ARG_WITH_STRING], [AC_ARG_WITH([$1], [$2], [$3], [$4])]) dnl MOZ_ARG_HEADER(Comment) @@ -118,7 +118,7 @@ dnl library unless is included so we need to test dnl using it dnl dnl MOZ_CHECK_PTHREADS(lib, success, failure) -AC_DEFUN(MOZ_CHECK_PTHREADS, +AC_DEFUN([MOZ_CHECK_PTHREADS], [ AC_MSG_CHECKING([for pthread_create in -l$1]) echo " @@ -145,7 +145,7 @@ echo " ]) dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file -AC_DEFUN(MOZ_READ_MOZCONFIG, +AC_DEFUN([MOZ_READ_MOZCONFIG], [AC_REQUIRE([AC_INIT_BINSH])dnl # Read in '.mozconfig' script to set the initial options. # See the mozconfig2configure script for more details. diff --git a/build/autoconf/freetype2.m4 b/build/autoconf/freetype2.m4 index 40a49fa..52b88bf 100644 --- a/build/autoconf/freetype2.m4 +++ b/build/autoconf/freetype2.m4 @@ -4,7 +4,7 @@ dnl AM_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS dnl -AC_DEFUN(AC_CHECK_FT2, +AC_DEFUN([AC_CHECK_FT2], [dnl dnl Get the cflags and libraries from the freetype-config script dnl diff --git a/build/autoconf/glib.m4 b/build/autoconf/glib.m4 index eebb3ec..8552155 100644 --- a/build/autoconf/glib.m4 +++ b/build/autoconf/glib.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MO dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or dnl gthread is specified in MODULES, pass to glib-config dnl -AC_DEFUN(AM_PATH_GLIB, +AC_DEFUN([AM_PATH_GLIB], [dnl dnl Get the cflags and libraries from the glib-config script dnl diff --git a/build/autoconf/gtk.m4 b/build/autoconf/gtk.m4 index 9d2a938..4e00dba 100644 --- a/build/autoconf/gtk.m4 +++ b/build/autoconf/gtk.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl diff --git a/build/autoconf/libIDL-2.m4 b/build/autoconf/libIDL-2.m4 index ccfb658..a4d6ac5 100644 --- a/build/autoconf/libIDL-2.m4 +++ b/build/autoconf/libIDL-2.m4 @@ -3,7 +3,7 @@ dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS dnl -AC_DEFUN(AM_PATH_LIBIDL_2, +AC_DEFUN([AM_PATH_LIBIDL_2], [dnl dnl Get the cflags and libraries from the libIDL-config-2 script dnl diff --git a/build/autoconf/libIDL.m4 b/build/autoconf/libIDL.m4 index 48fa743..3c0979c 100644 --- a/build/autoconf/libIDL.m4 +++ b/build/autoconf/libIDL.m4 @@ -3,7 +3,7 @@ dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS dnl -AC_DEFUN(AM_PATH_LIBIDL, +AC_DEFUN([AM_PATH_LIBIDL], [dnl dnl Get the cflags and libraries from the libIDL-config script dnl diff --git a/build/autoconf/libart.m4 b/build/autoconf/libart.m4 index 9380a22..a84b1da 100644 --- a/build/autoconf/libart.m4 +++ b/build/autoconf/libart.m4 @@ -8,7 +8,7 @@ dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS dnl -AC_DEFUN(AM_PATH_LIBART, +AC_DEFUN([AM_PATH_LIBART], [dnl dnl Get the cflags and libraries from the libart-config script dnl diff --git a/build/autoconf/nspr.m4 b/build/autoconf/nspr.m4 index 8174bea..85cfe2c 100644 --- a/build/autoconf/nspr.m4 +++ b/build/autoconf/nspr.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS -AC_DEFUN(AM_PATH_NSPR, +AC_DEFUN([AM_PATH_NSPR], [dnl AC_ARG_WITH(nspr-prefix, diff --git a/build/autoconf/pkg.m4 b/build/autoconf/pkg.m4 index c4fe9fb..f5df7a2 100644 --- a/build/autoconf/pkg.m4 +++ b/build/autoconf/pkg.m4 @@ -2,7 +2,7 @@ dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ +AC_DEFUN([PKG_CHECK_MODULES], [ succeeded=no if test -z "$PKG_CONFIG"; then diff --git a/directory/c-sdk/config/autoconf/nspr.m4 b/directory/c-sdk/config/autoconf/nspr.m4 index 8174bea..85cfe2c 100644 --- a/directory/c-sdk/config/autoconf/nspr.m4 +++ b/directory/c-sdk/config/autoconf/nspr.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS -AC_DEFUN(AM_PATH_NSPR, +AC_DEFUN([AM_PATH_NSPR], [dnl AC_ARG_WITH(nspr-prefix, diff --git a/nsprpub/config/nspr.m4 b/nsprpub/config/nspr.m4 index 8174bea..85cfe2c 100644 --- a/nsprpub/config/nspr.m4 +++ b/nsprpub/config/nspr.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS -AC_DEFUN(AM_PATH_NSPR, +AC_DEFUN([AM_PATH_NSPR], [dnl AC_ARG_WITH(nspr-prefix, -- 1.4.4.4