From 98377a48695e735a56e6b4f4e4304777610a6c0b Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Mon, 4 Oct 2004 15:44:03 +0000 Subject: Quote DEFUN names to make recent autoconf happy. --- conf/m4/kde/AC_BASE_PATH_KDE.m4 | 2 +- conf/m4/kde/AC_CHECK_BOOL.m4 | 2 +- conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4 | 2 +- conf/m4/kde/AC_CHECK_KSIZE_T.m4 | 2 +- conf/m4/kde/AC_CHECK_RPATH.m4 | 2 +- conf/m4/kde/AC_CREATE_KFSSTND.m4 | 2 +- conf/m4/kde/AC_FIND_FILE.m4 | 2 +- conf/m4/kde/AC_FIND_PNG.m4 | 2 +- conf/m4/kde/AC_FIND_ZLIB.m4 | 2 +- conf/m4/kde/AC_PATH_KDE.m4 | 2 +- conf/m4/kde/AC_PATH_QT.m4 | 2 +- conf/m4/kde/AC_PATH_QT_1_3.m4 | 4 ++-- conf/m4/kde/AC_PATH_QT_MOC.m4 | 4 ++-- conf/m4/kde/AC_SUBST_KFSSTND.m4 | 2 +- conf/m4/kde/AM_KDE_GNU_GETTEXT.m4 | 2 +- conf/m4/kde/AM_KDE_WITH_NLS.m4 | 2 +- conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4 | 2 +- conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 | 2 +- conf/m4/kde/KDE_CHECK_FINAL.m4 | 2 +- conf/m4/kde/KDE_CHECK_LIBDL.m4 | 2 +- conf/m4/kde/KDE_CHECK_QT_DIRECT.m4 | 2 +- conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 | 2 +- conf/m4/kde/KDE_FIND_PATH.m4 | 2 +- conf/m4/kde/KDE_MISC_TESTS.m4 | 2 +- conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 | 2 +- conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 | 2 +- conf/m4/kde/KDE_SUBST_PROGRAMS.m4 | 2 +- conf/m4/kde/KDE_USE_QT.m4 | 2 +- conf/m4/kde/KDE_VERSION.m4 | 2 +- conf/m4/kde/K_PATH_X.m4 | 4 ++-- 30 files changed, 33 insertions(+), 33 deletions(-) (limited to 'conf/m4/kde') diff --git a/conf/m4/kde/AC_BASE_PATH_KDE.m4 b/conf/m4/kde/AC_BASE_PATH_KDE.m4 index 36abd13..dbc9f9d 100644 --- a/conf/m4/kde/AC_BASE_PATH_KDE.m4 +++ b/conf/m4/kde/AC_BASE_PATH_KDE.m4 @@ -4,7 +4,7 @@ dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed) dnl and $(kde_includes) will be the kdehdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_BASE_PATH_KDE, +AC_DEFUN([AC_BASE_PATH_KDE], [ AC_PREREQ([2.13]) AC_REQUIRE([KDE_MISC_TESTS]) diff --git a/conf/m4/kde/AC_CHECK_BOOL.m4 b/conf/m4/kde/AC_CHECK_BOOL.m4 index 467bc74..d718d43 100644 --- a/conf/m4/kde/AC_CHECK_BOOL.m4 +++ b/conf/m4/kde/AC_CHECK_BOOL.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_CHECK_BOOL, +AC_DEFUN([AC_CHECK_BOOL], [ AC_MSG_CHECKING([for bool]) AC_CACHE_VAL(ac_cv_have_bool, diff --git a/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4 b/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4 index 4255106..07f3dfb 100644 --- a/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4 +++ b/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4 @@ -2,7 +2,7 @@ dnl ------------------------------------------------------------------------ dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_CHECK_KDEMAXPATHLEN, +AC_DEFUN([AC_CHECK_KDEMAXPATHLEN], [ AC_MSG_CHECKING(for MAXPATHLEN) AC_CACHE_VAL(ac_cv_maxpathlen, diff --git a/conf/m4/kde/AC_CHECK_KSIZE_T.m4 b/conf/m4/kde/AC_CHECK_KSIZE_T.m4 index df09679..ed6454f 100644 --- a/conf/m4/kde/AC_CHECK_KSIZE_T.m4 +++ b/conf/m4/kde/AC_CHECK_KSIZE_T.m4 @@ -1,5 +1,5 @@ dnl Check for the type of the third argument of getsockname -AC_DEFUN(AC_CHECK_KSIZE_T, +AC_DEFUN([AC_CHECK_KSIZE_T], [AC_MSG_CHECKING(for the third argument of getsockname) AC_CACHE_VAL(ac_cv_ksize_t, AC_LANG_SAVE diff --git a/conf/m4/kde/AC_CHECK_RPATH.m4 b/conf/m4/kde/AC_CHECK_RPATH.m4 index 64c29fb..b698ca6 100644 --- a/conf/m4/kde/AC_CHECK_RPATH.m4 +++ b/conf/m4/kde/AC_CHECK_RPATH.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_CHECK_RPATH, +AC_DEFUN([AC_CHECK_RPATH], [ AC_MSG_CHECKING(for rpath) AC_ARG_ENABLE(rpath, diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4 index bc8485b..c86563d 100644 --- a/conf/m4/kde/AC_CREATE_KFSSTND.m4 +++ b/conf/m4/kde/AC_CREATE_KFSSTND.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_CREATE_KFSSTND,[ +AC_DEFUN([AC_CREATE_KFSSTND],[ AC_REQUIRE([KDE_VERSION]) AC_MSG_CHECKING([for KDE paths]) kde_result="" diff --git a/conf/m4/kde/AC_FIND_FILE.m4 b/conf/m4/kde/AC_FIND_FILE.m4 index b87ae1a..ee0af7f 100644 --- a/conf/m4/kde/AC_FIND_FILE.m4 +++ b/conf/m4/kde/AC_FIND_FILE.m4 @@ -2,7 +2,7 @@ dnl ------------------------------------------------------------------------ dnl Find a file (or one of more files in a list of dirs) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_FIND_FILE, +AC_DEFUN([AC_FIND_FILE], [ $3=NO for i in $2; diff --git a/conf/m4/kde/AC_FIND_PNG.m4 b/conf/m4/kde/AC_FIND_PNG.m4 index 404a647..59a19d5 100644 --- a/conf/m4/kde/AC_FIND_PNG.m4 +++ b/conf/m4/kde/AC_FIND_PNG.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_FIND_PNG, +AC_DEFUN([AC_FIND_PNG], [ AC_REQUIRE([AC_FIND_ZLIB]) AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) diff --git a/conf/m4/kde/AC_FIND_ZLIB.m4 b/conf/m4/kde/AC_FIND_ZLIB.m4 index 527bf1e..f355ad9 100644 --- a/conf/m4/kde/AC_FIND_ZLIB.m4 +++ b/conf/m4/kde/AC_FIND_ZLIB.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_FIND_ZLIB, +AC_DEFUN([AC_FIND_ZLIB], [ AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for libz]) diff --git a/conf/m4/kde/AC_PATH_KDE.m4 b/conf/m4/kde/AC_PATH_KDE.m4 index aa8ee19..ad4867e 100644 --- a/conf/m4/kde/AC_PATH_KDE.m4 +++ b/conf/m4/kde/AC_PATH_KDE.m4 @@ -1,5 +1,5 @@ dnl -AC_DEFUN(AC_PATH_KDE,[ +AC_DEFUN([AC_PATH_KDE],[ AC_BASE_PATH_KDE AC_ARG_ENABLE(path-check, [ --disable-path-check don't try to find out, where to install], diff --git a/conf/m4/kde/AC_PATH_QT.m4 b/conf/m4/kde/AC_PATH_QT.m4 index bef8246..863ed7e 100644 --- a/conf/m4/kde/AC_PATH_QT.m4 +++ b/conf/m4/kde/AC_PATH_QT.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_PATH_QT, +AC_DEFUN([AC_PATH_QT], [ AC_PATH_QT_ANY ]) diff --git a/conf/m4/kde/AC_PATH_QT_1_3.m4 b/conf/m4/kde/AC_PATH_QT_1_3.m4 index 26c3536..20b5489 100644 --- a/conf/m4/kde/AC_PATH_QT_1_3.m4 +++ b/conf/m4/kde/AC_PATH_QT_1_3.m4 @@ -5,7 +5,7 @@ dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl dnl -AC_DEFUN(AC_TRY_PATH_QT,[ +AC_DEFUN([AC_TRY_PATH_QT],[ AC_REQUIRE([K_PATH_X]) AC_REQUIRE([KDE_USE_QT]) @@ -123,7 +123,7 @@ AC_DEFUN(AC_TRY_PATH_QT,[ ]) -AC_DEFUN(AC_PATH_QT_ANY,[ +AC_DEFUN([AC_PATH_QT_ANY],[ AC_MSG_CHECKING([for Qt]) AC_CACHE_VAL(ac_cv_have_qt,[ diff --git a/conf/m4/kde/AC_PATH_QT_MOC.m4 b/conf/m4/kde/AC_PATH_QT_MOC.m4 index 6635c2a..4d9da90 100644 --- a/conf/m4/kde/AC_PATH_QT_MOC.m4 +++ b/conf/m4/kde/AC_PATH_QT_MOC.m4 @@ -3,12 +3,12 @@ dnl Find the meta object compiler in the PATH, in $QTDIR/bin, and some dnl more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(KDE_MOC_ERROR_MESSAGE, +AC_DEFUN([KDE_MOC_ERROR_MESSAGE], [ AC_MSG_ERROR([Could not find meta object compiler (moc)]) ]) -AC_DEFUN(AC_PATH_QT_MOC, +AC_DEFUN([AC_PATH_QT_MOC], [ KDE_FIND_PATH(moc, MOC, [$ac_qt_bindir $QTDIR/bin $QTDIR/src/moc \ /usr/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/lib/qt2/bin \ diff --git a/conf/m4/kde/AC_SUBST_KFSSTND.m4 b/conf/m4/kde/AC_SUBST_KFSSTND.m4 index c3d4962..d19a018 100644 --- a/conf/m4/kde/AC_SUBST_KFSSTND.m4 +++ b/conf/m4/kde/AC_SUBST_KFSSTND.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_SUBST_KFSSTND, +AC_DEFUN([AC_SUBST_KFSSTND], [ AC_SUBST(kde_htmldir) AC_SUBST(kde_appsdir) diff --git a/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4 b/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4 index 79c0a15..ea53487 100644 --- a/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4 +++ b/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4 @@ -4,7 +4,7 @@ # serial 1 # Stephan Kulow: I put a KDE in it to avoid name conflicts -AC_DEFUN(AM_KDE_GNU_GETTEXT, +AC_DEFUN([AM_KDE_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_HEADER_STDC])dnl diff --git a/conf/m4/kde/AM_KDE_WITH_NLS.m4 b/conf/m4/kde/AM_KDE_WITH_NLS.m4 index 27e5b8c..f84076c 100644 --- a/conf/m4/kde/AM_KDE_WITH_NLS.m4 +++ b/conf/m4/kde/AM_KDE_WITH_NLS.m4 @@ -14,7 +14,7 @@ dnl PARTICULAR PURPOSE. dnl > dnl for this file it is relicensed under LGPL -AC_DEFUN(AM_KDE_WITH_NLS, +AC_DEFUN([AM_KDE_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, diff --git a/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4 b/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4 index 511fcb3..de1cba8 100644 --- a/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4 +++ b/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4 @@ -6,7 +6,7 @@ dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST_KDE, +AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) diff --git a/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 b/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 index 1a6deaa..f1edb66 100644 --- a/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 +++ b/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_CHECK_EXTRA_LIBS, +AC_DEFUN([KDE_CHECK_EXTRA_LIBS], [ AC_MSG_CHECKING(for extra includes) AC_ARG_WITH(extra-includes, [ --with-extra-includes=DIR diff --git a/conf/m4/kde/KDE_CHECK_FINAL.m4 b/conf/m4/kde/KDE_CHECK_FINAL.m4 index 0624149..f7ff656 100644 --- a/conf/m4/kde/KDE_CHECK_FINAL.m4 +++ b/conf/m4/kde/KDE_CHECK_FINAL.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_CHECK_FINAL, +AC_DEFUN([KDE_CHECK_FINAL], [ AC_ARG_ENABLE(final, [ --enable-final build size optimized apps (needs lots of memory)], kde_use_final=yes, kde_use_final=no, kde_use_final=no) diff --git a/conf/m4/kde/KDE_CHECK_LIBDL.m4 b/conf/m4/kde/KDE_CHECK_LIBDL.m4 index 8d230c5..8350752 100644 --- a/conf/m4/kde/KDE_CHECK_LIBDL.m4 +++ b/conf/m4/kde/KDE_CHECK_LIBDL.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_CHECK_LIBDL, +AC_DEFUN([KDE_CHECK_LIBDL], [ AC_CHECK_LIB(dl, dlopen, [ LIBDL="-ldl" diff --git a/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4 b/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4 index c57f927..3559279 100644 --- a/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4 +++ b/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_CHECK_QT_DIRECT, +AC_DEFUN([KDE_CHECK_QT_DIRECT], [ AC_REQUIRE([KDE_USE_QT]) AC_MSG_CHECKING([if Qt compiles without flags]) diff --git a/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 b/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 index 481ee60..9c9652b 100644 --- a/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 +++ b/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_CREATE_LIBS_ALIASES, +AC_DEFUN([KDE_CREATE_LIBS_ALIASES], [ AC_REQUIRE([KDE_MISC_TESTS]) AC_REQUIRE([KDE_CHECK_LIBDL]) diff --git a/conf/m4/kde/KDE_FIND_PATH.m4 b/conf/m4/kde/KDE_FIND_PATH.m4 index 382a3d9..08e14fe 100644 --- a/conf/m4/kde/KDE_FIND_PATH.m4 +++ b/conf/m4/kde/KDE_FIND_PATH.m4 @@ -1,6 +1,6 @@ dnl KDE_FIND_PATH(programm-name, variable-name, list of directories, dnl if-not-found, test-parameter) -AC_DEFUN(KDE_FIND_PATH, +AC_DEFUN([KDE_FIND_PATH], [ AC_MSG_CHECKING([for $1]) kde_cache=`echo $1 | sed 'y%./+-%__p_%'` diff --git a/conf/m4/kde/KDE_MISC_TESTS.m4 b/conf/m4/kde/KDE_MISC_TESTS.m4 index 30c97fe..00e49d1 100644 --- a/conf/m4/kde/KDE_MISC_TESTS.m4 +++ b/conf/m4/kde/KDE_MISC_TESTS.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_MISC_TESTS, +AC_DEFUN([KDE_MISC_TESTS], [ AC_LANG_C dnl Checks for libraries. diff --git a/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 b/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 index e8b1d53..b2a2f9f 100644 --- a/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 +++ b/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_MISSING_PROG_ERROR, +AC_DEFUN([KDE_MISSING_PROG_ERROR], [ AC_MSG_ERROR([The important program $1 was not found! Please check whether you installed KDE correctly. diff --git a/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 b/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 index 71e6269..0af7fad 100644 --- a/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 +++ b/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_PRINT_QT_PROGRAM,[ +AC_DEFUN([KDE_PRINT_QT_PROGRAM],[ AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<-EOF #include "confdefs.h" diff --git a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 index 128e6ef..8c10b81 100644 --- a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 +++ b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_SUBST_PROGRAMS, +AC_DEFUN([KDE_SUBST_PROGRAMS], [AC_REQUIRE([AC_CREATE_KFSSTND])dnl kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin" diff --git a/conf/m4/kde/KDE_USE_QT.m4 b/conf/m4/kde/KDE_USE_QT.m4 index 651ed7b..142eb32 100644 --- a/conf/m4/kde/KDE_USE_QT.m4 +++ b/conf/m4/kde/KDE_USE_QT.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(KDE_USE_QT, +AC_DEFUN([KDE_USE_QT], [ if test -z "$1"; then kde_qtver=2 diff --git a/conf/m4/kde/KDE_VERSION.m4 b/conf/m4/kde/KDE_VERSION.m4 index 65fee9d..9ae9026 100644 --- a/conf/m4/kde/KDE_VERSION.m4 +++ b/conf/m4/kde/KDE_VERSION.m4 @@ -1,7 +1,7 @@ dnl dnl Check KDE version dnl -AC_DEFUN(KDE_VERSION, +AC_DEFUN([KDE_VERSION], [ ac_kde_version=2 AC_MSG_CHECKING(for KDE version) diff --git a/conf/m4/kde/K_PATH_X.m4 b/conf/m4/kde/K_PATH_X.m4 index db168ee..d497942 100644 --- a/conf/m4/kde/K_PATH_X.m4 +++ b/conf/m4/kde/K_PATH_X.m4 @@ -1,7 +1,7 @@ # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. dnl Set ac_x_includes and/or ac_x_libraries. -AC_DEFUN(KDE_PATH_X_DIRECT, +AC_DEFUN([KDE_PATH_X_DIRECT], [if test "$ac_x_includes" = NO; then # Guess where to find include files, by looking for this one X11 .h file. test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h @@ -125,7 +125,7 @@ dnl Find the header files and libraries for X-Windows. Extended the dnl macro AC_PATH_X dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(K_PATH_X,[ +AC_DEFUN([K_PATH_X],[ AC_REQUIRE([AC_PROG_CPP]) AC_MSG_CHECKING(for X) AC_LANG_SAVE -- cgit v1.2.3