+++ /dev/null
---- admin/acinclude.m4.in.orig 2004-01-04 14:41:18.653215568 +0100
-+++ admin/acinclude.m4.in 2004-01-04 14:40:41.376882432 +0100
-@@ -29,7 +29,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],
- [
- AC_REQUIRE([KDE_CHECK_LIB64])
-
-@@ -156,7 +156,7 @@
- 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;
-@@ -175,7 +175,7 @@
-
- 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])
- if test -n "$$2"; then
-@@ -228,7 +228,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_MOC_ERROR_MESSAGE,
-+AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
- [
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
- Please check whether you installed Qt correctly.
-@@ -240,7 +240,7 @@
- ])
- ])
-
--AC_DEFUN(KDE_UIC_ERROR_MESSAGE,
-+AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
- [
- AC_MSG_WARN([No Qt ui compiler (uic) found!
- Please check whether you installed Qt correctly.
-@@ -253,7 +253,7 @@
- ])
-
-
--AC_DEFUN(KDE_CHECK_UIC_FLAG,
-+AC_DEFUN([KDE_CHECK_UIC_FLAG],
- [
- AC_MSG_CHECKING([whether uic supports -$1 ])
- kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-@@ -288,7 +288,7 @@
- dnl in $QTDIR/bin, and some more usual places
- dnl ------------------------------------------------------------------------
- dnl
--AC_DEFUN(AC_PATH_QT_MOC_UIC,
-+AC_DEFUN([AC_PATH_QT_MOC_UIC],
- [
- AC_REQUIRE([KDE_CHECK_PERL])
- qt_bindirs=""
-@@ -336,7 +336,7 @@
- AC_SUBST(UIC_TR)
- ])
-
--AC_DEFUN(KDE_1_CHECK_PATHS,
-+AC_DEFUN([KDE_1_CHECK_PATHS],
- [
- KDE_1_CHECK_PATH_HEADERS
-
-@@ -384,7 +384,7 @@
-
- ])
-
--AC_DEFUN(KDE_SET_PATHS,
-+AC_DEFUN([KDE_SET_PATHS],
- [
- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
- kde_htmldir=\"$kde_htmldir\" \
-@@ -412,7 +412,7 @@
- kde_result=$1"
- ])
-
--AC_DEFUN(KDE_SET_DEFAULT_PATHS,
-+AC_DEFUN([KDE_SET_DEFAULT_PATHS],
- [
- if test "$1" = "default"; then
-
-@@ -501,7 +501,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_PATHS_FOR_COMPLETENESS,
-+AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
- [ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
- test -z "$kde_datadir" || test -z "$kde_locale" ||
-@@ -518,14 +518,14 @@
- fi
- ])
-
--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.
- ])
- ])
-
--AC_DEFUN(KDE_MISSING_ARTS_ERROR,
-+AC_DEFUN([KDE_MISSING_ARTS_ERROR],
- [
- AC_MSG_ERROR([The important program $1 was not found!
- Please check whether you installed aRts correctly or use
-@@ -533,7 +533,7 @@
- ])
- ])
-
--AC_DEFUN(KDE_SUBST_PROGRAMS,
-+AC_DEFUN([KDE_SUBST_PROGRAMS],
- [
- AC_ARG_WITH(arts,
- [ --without-arts build without aRts [default=yes] ],
-@@ -623,7 +623,7 @@
- AC_SUBST(kde_libs_htmldir)
- ])dnl
-
--AC_DEFUN(AC_CREATE_KFSSTND,
-+AC_DEFUN([AC_CREATE_KFSSTND],
- [
- AC_REQUIRE([AC_CHECK_RPATH])
-
-@@ -671,7 +671,7 @@
-
- ])
-
--AC_DEFUN(AC_SUBST_KFSSTND,
-+AC_DEFUN([AC_SUBST_KFSSTND],
- [
- AC_SUBST(kde_htmldir)
- AC_SUBST(kde_appsdir)
-@@ -708,7 +708,7 @@
- dnl AC_SUBST(kde_toolbardir)
- ])
-
--AC_DEFUN(KDE_MISC_TESTS,
-+AC_DEFUN([KDE_MISC_TESTS],
- [
- dnl Checks for libraries.
- AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD
-@@ -843,7 +843,7 @@
- dnl macro AC_PATH_X
- dnl ------------------------------------------------------------------------
- dnl
--AC_DEFUN(K_PATH_X,
-+AC_DEFUN([K_PATH_X],
- [
- AC_REQUIRE([KDE_MISC_TESTS])dnl
- AC_REQUIRE([KDE_CHECK_LIB64])
-@@ -1060,7 +1060,7 @@
-
- ])
-
--AC_DEFUN(KDE_PRINT_QT_PROGRAM,
-+AC_DEFUN([KDE_PRINT_QT_PROGRAM],
- [
- AC_REQUIRE([KDE_USE_QT])
- cat > conftest.$ac_ext <<EOF
-@@ -1123,7 +1123,7 @@
- EOF
- ])
-
--AC_DEFUN(KDE_USE_QT,
-+AC_DEFUN([KDE_USE_QT],
- [
- if test -z "$1"; then
- # Current default Qt version: 3.2
-@@ -1202,7 +1202,7 @@
- fi
- ])
-
--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])
-@@ -1265,7 +1265,7 @@
- dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
- dnl ------------------------------------------------------------------------
- dnl
--AC_DEFUN(AC_PATH_QT_1_3,
-+AC_DEFUN([AC_PATH_QT_1_3],
- [
- AC_REQUIRE([K_PATH_X])
- AC_REQUIRE([KDE_USE_QT])
-@@ -1571,12 +1571,12 @@
- AC_SUBST(kde_qtver)
- ])
-
--AC_DEFUN(AC_PATH_QT,
-+AC_DEFUN([AC_PATH_QT],
- [
- AC_PATH_QT_1_3
- ])
-
--AC_DEFUN(KDE_CHECK_UIC_PLUGINS,
-+AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
- [
- AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-
-@@ -1624,7 +1624,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_FINAL,
-+AC_DEFUN([KDE_CHECK_FINAL],
- [
- AC_ARG_ENABLE(final, [ --enable-final build size optimized apps (experimental - needs lots of memory)],
- kde_use_final=$enableval, kde_use_final=no)
-@@ -1640,7 +1640,7 @@
- AC_SUBST(KDE_USE_FINAL_FALSE)
- ])
-
--AC_DEFUN(KDE_CHECK_CLOSURE,
-+AC_DEFUN([KDE_CHECK_CLOSURE],
- [
- AC_ARG_ENABLE(closure, [ --enable-closure delay template instantiation],
- kde_use_closure=$enableval, kde_use_closure=no)
-@@ -1669,7 +1669,7 @@
- AC_SUBST(KDE_NO_UNDEFINED)
- ])
-
--AC_DEFUN(KDE_CHECK_NMCHECK,
-+AC_DEFUN([KDE_CHECK_NMCHECK],
- [
- AC_ARG_ENABLE(nmcheck, [ --enable-nmcheck enable automatic namespace cleanness check],
- kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-@@ -1699,7 +1699,7 @@
- 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_CHECK_STL])
-@@ -1854,7 +1854,7 @@
-
- ])
-
--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
-@@ -1909,7 +1909,7 @@
-
- ])
-
--AC_DEFUN(KDE_1_CHECK_PATH_HEADERS,
-+AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
- [
- AC_MSG_CHECKING([for KDE headers installed])
- AC_LANG_SAVE
-@@ -1964,7 +1964,7 @@
- AC_LANG_RESTORE
- ])
-
--AC_DEFUN(KDE_CHECK_KDEQTADDON,
-+AC_DEFUN([KDE_CHECK_KDEQTADDON],
- [
- AC_MSG_CHECKING(for kde-qt-addon)
- AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-@@ -2000,7 +2000,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_KIMGIO,
-+AC_DEFUN([KDE_CHECK_KIMGIO],
- [
- AC_REQUIRE([AC_BASE_PATH_KDE])
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-@@ -2031,7 +2031,7 @@
- AC_SUBST(LIB_KIMGIO)
- ])
-
--AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
-+AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
- [
- AC_REQUIRE([KDE_MISC_TESTS])
- AC_REQUIRE([KDE_CHECK_LIBDL])
-@@ -2074,7 +2074,7 @@
- fi
- ])
-
--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],
-@@ -2099,7 +2099,7 @@
- ])
-
- dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
--AC_DEFUN(KDE_CHECK_FUNC_EXT,
-+AC_DEFUN([KDE_CHECK_FUNC_EXT],
- [
- AC_MSG_CHECKING(for $1)
- AC_CACHE_VAL(kde_cv_func_$1,
-@@ -2190,7 +2190,7 @@
- ])
- ])
-
--AC_DEFUN(AC_CHECK_SETENV,
-+AC_DEFUN([AC_CHECK_SETENV],
- [
- KDE_CHECK_FUNC_EXT(setenv, [
- #include <stdlib.h>
-@@ -2200,7 +2200,7 @@
- [SETENV])
- ])
-
--AC_DEFUN(AC_CHECK_UNSETENV,
-+AC_DEFUN([AC_CHECK_UNSETENV],
- [
- KDE_CHECK_FUNC_EXT(unsetenv, [
- #include <stdlib.h>
-@@ -2210,7 +2210,7 @@
- [UNSETENV])
- ])
-
--AC_DEFUN(AC_CHECK_GETDOMAINNAME,
-+AC_DEFUN([AC_CHECK_GETDOMAINNAME],
- [
- KDE_CHECK_FUNC_EXT(getdomainname, [
- #include <stdlib.h>
-@@ -2226,7 +2226,7 @@
- [GETDOMAINNAME])
- ])
-
--AC_DEFUN(AC_CHECK_GETHOSTNAME,
-+AC_DEFUN([AC_CHECK_GETHOSTNAME],
- [
- KDE_CHECK_FUNC_EXT(gethostname, [
- #include <stdlib.h>
-@@ -2240,7 +2240,7 @@
- [GETHOSTNAME])
- ])
-
--AC_DEFUN(AC_CHECK_USLEEP,
-+AC_DEFUN([AC_CHECK_USLEEP],
- [
- KDE_CHECK_FUNC_EXT(usleep, [
- #include <unistd.h>
-@@ -2253,7 +2253,7 @@
- ])
-
-
--AC_DEFUN(AC_CHECK_RANDOM,
-+AC_DEFUN([AC_CHECK_RANDOM],
- [
- KDE_CHECK_FUNC_EXT(random, [
- #include <stdlib.h>
-@@ -2275,7 +2275,7 @@
-
- ])
-
--AC_DEFUN(AC_CHECK_INITGROUPS,
-+AC_DEFUN([AC_CHECK_INITGROUPS],
- [
- KDE_CHECK_FUNC_EXT(initgroups, [
- #include <sys/types.h>
-@@ -2290,7 +2290,7 @@
- [INITGROUPS])
- ])
-
--AC_DEFUN(AC_CHECK_MKSTEMPS,
-+AC_DEFUN([AC_CHECK_MKSTEMPS],
- [
- KDE_CHECK_FUNC_EXT(mkstemps, [
- #include <stdlib.h>
-@@ -2303,7 +2303,7 @@
- [MKSTEMPS])
- ])
-
--AC_DEFUN(AC_CHECK_MKDTEMP,
-+AC_DEFUN([AC_CHECK_MKDTEMP],
- [
- KDE_CHECK_FUNC_EXT(mkdtemp, [
- #include <stdlib.h>
-@@ -2317,7 +2317,7 @@
- ])
-
-
--AC_DEFUN(AC_CHECK_RES_INIT,
-+AC_DEFUN([AC_CHECK_RES_INIT],
- [
- AC_MSG_CHECKING([if res_init needs -lresolv])
- kde_libs_safe="$LIBS"
-@@ -2361,7 +2361,7 @@
- )
- ])
-
--AC_DEFUN(AC_CHECK_STRLCPY,
-+AC_DEFUN([AC_CHECK_STRLCPY],
- [
- KDE_CHECK_FUNC_EXT(strlcpy, [
- #include <string.h>
-@@ -2373,7 +2373,7 @@
- [STRLCPY])
- ])
-
--AC_DEFUN(AC_CHECK_STRLCAT,
-+AC_DEFUN([AC_CHECK_STRLCAT],
- [
- KDE_CHECK_FUNC_EXT(strlcat, [
- #include <string.h>
-@@ -2386,7 +2386,7 @@
- [STRLCAT])
- ])
-
--AC_DEFUN(AC_FIND_GIF,
-+AC_DEFUN([AC_FIND_GIF],
- [AC_MSG_CHECKING([for giflib])
- AC_CACHE_VAL(ac_cv_lib_gif,
- [ac_save_LIBS="$LIBS"
-@@ -2420,7 +2420,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_FIND_JPEG_HELPER,
-+AC_DEFUN([KDE_FIND_JPEG_HELPER],
- [
- AC_MSG_CHECKING([for libjpeg$2])
- AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-@@ -2462,7 +2462,7 @@
-
- ])
-
--AC_DEFUN(AC_FIND_JPEG,
-+AC_DEFUN([AC_FIND_JPEG],
- [
- dnl first look for libraries
- KDE_FIND_JPEG_HELPER(6b, 6b,
-@@ -2514,7 +2514,7 @@
- ])
- ])
-
--AC_DEFUN(KDE_CHECK_QT_JPEG,
-+AC_DEFUN([KDE_CHECK_QT_JPEG],
- [
- if test -n "$LIBJPEG"; then
- AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-@@ -2551,7 +2551,7 @@
-
- ])
-
--AC_DEFUN(AC_FIND_ZLIB,
-+AC_DEFUN([AC_FIND_ZLIB],
- [
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
- AC_MSG_CHECKING([for libz])
-@@ -2593,7 +2593,7 @@
- AC_SUBST(LIBZ)
- ])
-
--AC_DEFUN(KDE_TRY_TIFFLIB,
-+AC_DEFUN([KDE_TRY_TIFFLIB],
- [
- AC_MSG_CHECKING([for libtiff $1])
-
-@@ -2639,7 +2639,7 @@
-
- ])
-
--AC_DEFUN(AC_FIND_TIFF,
-+AC_DEFUN([AC_FIND_TIFF],
- [
- AC_REQUIRE([K_PATH_X])
- AC_REQUIRE([AC_FIND_ZLIB])
-@@ -2653,7 +2653,7 @@
- ])
-
-
--AC_DEFUN(AC_FIND_PNG,
-+AC_DEFUN([AC_FIND_PNG],
- [
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
- AC_REQUIRE([AC_FIND_ZLIB])
-@@ -2697,7 +2697,7 @@
- ])
-
-
--AC_DEFUN(AC_FIND_JASPER,
-+AC_DEFUN([AC_FIND_JASPER],
- [
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
- AC_REQUIRE([AC_FIND_JPEG])
-@@ -2733,12 +2733,12 @@
- AC_SUBST(LIB_JASPER)
- ])
-
--AC_DEFUN(AC_CHECK_BOOL,
-+AC_DEFUN([AC_CHECK_BOOL],
- [
- AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
- ])
-
--AC_DEFUN(AC_CHECK_GNU_EXTENSIONS,
-+AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
- [
- AC_MSG_CHECKING(if you need GNU extensions)
- AC_CACHE_VAL(ac_cv_gnu_extensions,
-@@ -2766,7 +2766,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_COMPILER_FLAG,
-+AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
- [
- AC_MSG_CHECKING([whether $CXX supports -$1])
- kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-@@ -2794,7 +2794,7 @@
- dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
- dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
- dnl it's all white-space separated
--AC_DEFUN(AC_REMOVE_FORBIDDEN,
-+AC_DEFUN([AC_REMOVE_FORBIDDEN],
- [ __val=$$1
- __forbid=" $2 "
- if test -n "$__val"; then
-@@ -2815,7 +2815,7 @@
- ])
-
- dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
--AC_DEFUN(AC_VALIDIFY_CXXFLAGS,
-+AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
- [dnl
- if test "x$kde_use_qt_emb" != "xyes"; then
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
-@@ -2826,7 +2826,7 @@
- fi
- ])
-
--AC_DEFUN(AC_CHECK_COMPILERS,
-+AC_DEFUN([AC_CHECK_COMPILERS],
- [
- AC_ARG_ENABLE(debug,[ --enable-debug[=ARG] enables debug symbols (yes|no|full) [default=no]],
- [
-@@ -3055,14 +3055,14 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
-
--AC_DEFUN(KDE_ADD_DEPENDENCIES,
-+AC_DEFUN([KDE_ADD_DEPENDENCIES],
- [
- [A]M_DEPENDENCIES(CC)
- [A]M_DEPENDENCIES(CXX)
- ])
-
- dnl just a wrapper to clean up configure.in
--AC_DEFUN(KDE_PROG_LIBTOOL,
-+AC_DEFUN([KDE_PROG_LIBTOOL],
- [
- AC_REQUIRE([AC_CHECK_COMPILERS])
- AC_REQUIRE([AC_ENABLE_SHARED])
-@@ -3086,7 +3086,7 @@
- AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
- ])
-
--AC_DEFUN(KDE_CHECK_LIB64,
-+AC_DEFUN([KDE_CHECK_LIB64],
- [
- kdelibsuff=no
- AC_ARG_ENABLE(libsuffix,
-@@ -3111,13 +3111,13 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_TYPES,
-+AC_DEFUN([KDE_CHECK_TYPES],
- [ AC_CHECK_SIZEOF(int, 4)dnl
- AC_CHECK_SIZEOF(long, 4)dnl
- AC_CHECK_SIZEOF(char *, 4)dnl
- ])dnl
-
--AC_DEFUN(KDE_DO_IT_ALL,
-+AC_DEFUN([KDE_DO_IT_ALL],
- [
- AC_CANONICAL_SYSTEM
- AC_ARG_PROGRAM
-@@ -3130,7 +3130,7 @@
- AC_PATH_KDE
- ])
-
--AC_DEFUN(AC_CHECK_RPATH,
-+AC_DEFUN([AC_CHECK_RPATH],
- [
- AC_MSG_CHECKING(for rpath)
- AC_ARG_ENABLE(rpath,
-@@ -3160,7 +3160,7 @@
- ])
-
- dnl Check for the type of the third argument of getsockname
--AC_DEFUN(AC_CHECK_SOCKLEN_T, [
-+AC_DEFUN([AC_CHECK_SOCKLEN_T], [
- AC_MSG_CHECKING(for socklen_t)
- AC_CACHE_VAL(ac_cv_socklen_t, [
- AC_LANG_SAVE
-@@ -3212,7 +3212,7 @@
- dnl >
- dnl for this file it is relicensed under LGPL
-
--AC_DEFUN(AM_KDE_WITH_NLS,
-+AC_DEFUN([AM_KDE_WITH_NLS],
- [
- dnl If we use NLS figure out what method
-
-@@ -3255,7 +3255,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])
-@@ -3297,7 +3297,7 @@
-
- # serial 1
-
--AC_DEFUN(AM_LC_MESSAGES,
-+AC_DEFUN([AM_LC_MESSAGES],
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-@@ -3343,7 +3343,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
-@@ -3405,7 +3405,7 @@
-
- ])
-
--AC_DEFUN(AC_HAVE_XPM,
-+AC_DEFUN([AC_HAVE_XPM],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-@@ -3460,7 +3460,7 @@
- AC_SUBST(XPMLIB)
- ])
-
--AC_DEFUN(AC_HAVE_DPMS,
-+AC_DEFUN([AC_HAVE_DPMS],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-@@ -3561,7 +3561,7 @@
- AC_SUBST(DPMSLIB)
- ])
-
--AC_DEFUN(AC_HAVE_GL,
-+AC_DEFUN([AC_HAVE_GL],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-@@ -3644,7 +3644,7 @@
-
- dnl shadow password and PAM magic - maintained by ossi@kde.org
-
--AC_DEFUN(KDE_PAM, [
-+AC_DEFUN([KDE_PAM], [
- AC_REQUIRE([KDE_CHECK_LIBDL])
-
- want_pam=
-@@ -3707,7 +3707,7 @@
- ])
-
- dnl DEF_PAM_SERVICE(arg name, full name, define name)
--AC_DEFUN(DEF_PAM_SERVICE, [
-+AC_DEFUN([DEF_PAM_SERVICE], [
- AC_ARG_WITH($1-pam,
- [ --with-$1-pam=[val] override PAM service from --with-pam for $2],
- [ if test "x$use_pam" = xyes; then
-@@ -3728,7 +3728,7 @@
- AC_SUBST($3_PAM_SERVICE)
- ])
-
--AC_DEFUN(KDE_SHADOWPASSWD, [
-+AC_DEFUN([KDE_SHADOWPASSWD], [
- AC_REQUIRE([KDE_PAM])
-
- AC_CHECK_LIB(shadow, getspent,
-@@ -3785,7 +3785,7 @@
-
- ])
-
--AC_DEFUN(KDE_PASSWDLIBS, [
-+AC_DEFUN([KDE_PASSWDLIBS], [
- AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
- AC_REQUIRE([KDE_PAM])
- AC_REQUIRE([KDE_SHADOWPASSWD])
-@@ -3811,7 +3811,7 @@
- AC_SUBST(PASSWDLIBS)
- ])
-
--AC_DEFUN(KDE_CHECK_LIBDL,
-+AC_DEFUN([KDE_CHECK_LIBDL],
- [
- AC_CHECK_LIB(dl, dlopen, [
- LIBDL="-ldl"
-@@ -3826,7 +3826,7 @@
- AC_SUBST(LIBDL)
- ])
-
--AC_DEFUN(KDE_CHECK_DLOPEN,
-+AC_DEFUN([KDE_CHECK_DLOPEN],
- [
- KDE_CHECK_LIBDL
- AC_CHECK_HEADERS(dlfcn.h dl.h)
-@@ -3866,7 +3866,7 @@
-
- ])
-
--AC_DEFUN(KDE_CHECK_DYNAMIC_LOADING,
-+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
- [
- KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
- KDE_PROG_LIBTOOL
-@@ -3886,7 +3886,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_ADD_INCLUDES,
-+AC_DEFUN([KDE_ADD_INCLUDES],
- [
- if test -z "$1"; then
- test_include="Pix.h"
-@@ -3923,7 +3923,7 @@
- ])
- ])
-
--AC_DEFUN(KDE_CHECK_LIBPTHREAD,
-+AC_DEFUN([KDE_CHECK_LIBPTHREAD],
- [
- LIBPTHREAD=""
-
-@@ -3941,7 +3941,7 @@
- AC_SUBST(LIBPTHREAD)
- ])
-
--AC_DEFUN(KDE_CHECK_PTHREAD_OPTION,
-+AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
- [
- USE_THREADS=""
- if test -z "$LIBPTHREAD"; then
-@@ -3978,7 +3978,7 @@
- AC_SUBST(LIBPTHREAD)
- ])
-
--AC_DEFUN(KDE_CHECK_THREADING,
-+AC_DEFUN([KDE_CHECK_THREADING],
- [
- AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
- AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
-@@ -3999,7 +3999,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_TRY_LINK_PYTHON,
-+AC_DEFUN([KDE_TRY_LINK_PYTHON],
- [
- if test "$kde_python_link_found" = no; then
-
-@@ -4048,7 +4048,7 @@
-
- ])
-
--AC_DEFUN(KDE_CHECK_PYTHON_DIR,
-+AC_DEFUN([KDE_CHECK_PYTHON_DIR],
- [
- AC_MSG_CHECKING([for Python directory])
-
-@@ -4071,7 +4071,7 @@
- AC_MSG_RESULT($ac_python_dir)
- ])
-
--AC_DEFUN(KDE_CHECK_PYTHON_INTERN,
-+AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
- [
- AC_REQUIRE([KDE_CHECK_LIBDL])
- AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-@@ -4163,7 +4163,7 @@
- ])
-
-
--AC_DEFUN(KDE_CHECK_PYTHON,
-+AC_DEFUN([KDE_CHECK_PYTHON],
- [
- KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
-@@ -4175,7 +4175,7 @@
- ])
- ])
-
--AC_DEFUN(KDE_CHECK_STL,
-+AC_DEFUN([KDE_CHECK_STL],
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-@@ -4211,7 +4211,7 @@
- AC_LANG_RESTORE
- ])
-
--AC_DEFUN(AC_FIND_QIMGIO,
-+AC_DEFUN([AC_FIND_QIMGIO],
- [AC_REQUIRE([AC_FIND_JPEG])
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
- AC_MSG_CHECKING([for qimgio])
-@@ -4250,7 +4250,7 @@
- fi
- ])
-
--AC_DEFUN(AM_DISABLE_LIBRARIES,
-+AC_DEFUN([AM_DISABLE_LIBRARIES],
- [
- AC_PROVIDE([AM_ENABLE_STATIC])
- AC_PROVIDE([AM_ENABLE_SHARED])
-@@ -4259,7 +4259,7 @@
- ])
-
-
--AC_DEFUN(AC_CHECK_UTMP_FILE,
-+AC_DEFUN([AC_CHECK_UTMP_FILE],
- [
- AC_MSG_CHECKING([for utmp file])
-
-@@ -4292,7 +4292,7 @@
- ])
-
-
--AC_DEFUN(KDE_CREATE_SUBDIRSLIST,
-+AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
- [
-
- DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-@@ -4339,7 +4339,7 @@
- AC_SUBST(TOPSUBDIRS)
- ])
-
--AC_DEFUN(KDE_CHECK_NAMESPACES,
-+AC_DEFUN([KDE_CHECK_NAMESPACES],
- [
- AC_MSG_CHECKING(whether C++ compiler supports namespaces)
- AC_LANG_SAVE
-@@ -4369,7 +4369,7 @@
- dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
- dnl ------------------------------------------------------------------------
- dnl
--AC_DEFUN(AC_CHECK_S_ISSOCK,
-+AC_DEFUN([AC_CHECK_S_ISSOCK],
- [
- AC_MSG_CHECKING(for S_ISSOCK)
- AC_CACHE_VAL(ac_cv_have_s_issock,
-@@ -4404,7 +4404,7 @@
- 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,
-@@ -4438,7 +4438,7 @@
- AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
- ])
-
--AC_DEFUN(KDE_CHECK_HEADER,
-+AC_DEFUN([KDE_CHECK_HEADER],
- [
- AC_LANG_SAVE
- kde_safe_cppflags=$CPPFLAGS
-@@ -4449,7 +4449,7 @@
- AC_LANG_RESTORE
- ])
-
--AC_DEFUN(KDE_CHECK_HEADERS,
-+AC_DEFUN([KDE_CHECK_HEADERS],
- [
- AH_CHECK_HEADERS([$1])
- AC_LANG_SAVE
-@@ -4461,14 +4461,14 @@
- AC_LANG_RESTORE
- ])
-
--AC_DEFUN(KDE_FAST_CONFIGURE,
-+AC_DEFUN([KDE_FAST_CONFIGURE],
- [
- dnl makes configure fast (needs perl)
- AC_ARG_ENABLE(fast-perl, [ --disable-fast-perl disable fast Makefile generation (needs perl)],
- with_fast_perl=$enableval, with_fast_perl=yes)
- ])
-
--AC_DEFUN(KDE_CONF_FILES,
-+AC_DEFUN([KDE_CONF_FILES],
- [
- val=
- if test -f $srcdir/configure.files ; then
-@@ -4483,7 +4483,7 @@
- AC_SUBST(CONF_FILES)
- ])dnl
-
--AC_DEFUN(KDE_SET_PREFIX,
-+AC_DEFUN([KDE_SET_PREFIX],
- [
- unset CDPATH
- dnl make $KDEDIR the default for the installation
-@@ -4566,7 +4566,7 @@
- fi
- ])dnl
-
--AC_DEFUN(KDE_LANG_CPLUSPLUS,
-+AC_DEFUN([KDE_LANG_CPLUSPLUS],
- [AC_LANG_CPLUSPLUS
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
- pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-@@ -4577,7 +4577,7 @@
- KDE_LANG_CPLUSPLUS
- ])
-
--AC_DEFUN(KDE_CHECK_LONG_LONG,
-+AC_DEFUN([KDE_CHECK_LONG_LONG],
- [
- AC_MSG_CHECKING(for long long)
- AC_CACHE_VAL(kde_cv_c_long_long,
-@@ -4597,7 +4597,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_LIB,
-+AC_DEFUN([KDE_CHECK_LIB],
- [
- kde_save_LDFLAGS="$LDFLAGS"
- dnl AC_CHECK_LIB modifies LIBS, so save it here
-@@ -4613,7 +4613,7 @@
- LIBS="$kde_save_LIBS"
- ])
-
--AC_DEFUN(KDE_JAVA_PREFIX,
-+AC_DEFUN([KDE_JAVA_PREFIX],
- [
- dir=`dirname "$1"`
- base=`basename "$1"`
-@@ -4636,7 +4636,7 @@
- ])
-
- dnl KDE_CHEC_JAVA_DIR(onlyjre)
--AC_DEFUN(KDE_CHECK_JAVA_DIR,
-+AC_DEFUN([KDE_CHECK_JAVA_DIR],
- [
-
- AC_ARG_WITH(java,
-@@ -4886,7 +4886,7 @@
- m4_define([AC_FOREACH],
- [mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-
--AC_DEFUN(KDE_NEED_FLEX,
-+AC_DEFUN([KDE_NEED_FLEX],
- [
- kde_libs_safe=$LIBS
- LIBS="$LIBS $USER_LDFLAGS"
-@@ -4898,7 +4898,7 @@
- AC_SUBST(LEXLIB)
- ])
-
--AC_DEFUN(AC_PATH_QTOPIA,
-+AC_DEFUN([AC_PATH_QTOPIA],
- [
- dnl TODO: use AC_CACHE_VAL
-
-@@ -5002,7 +5002,7 @@
- ])
-
-
--AC_DEFUN(KDE_INIT_DOXYGEN,
-+AC_DEFUN([KDE_INIT_DOXYGEN],
- [
- AC_MSG_CHECKING([for Qt docs])
- kde_qtdir=
-@@ -5039,7 +5039,7 @@
- ])
-
-
--AC_DEFUN(AC_FIND_BZIP2,
-+AC_DEFUN([AC_FIND_BZIP2],
- [
- AC_MSG_CHECKING([for bzDecompress in libbz2])
- AC_CACHE_VAL(ac_cv_lib_bzip2,
-@@ -5126,7 +5126,7 @@
- dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
- dnl ------------------------------------------------------------------------
- dnl
--AC_DEFUN(KDE_CHECK_SSL,
-+AC_DEFUN([KDE_CHECK_SSL],
- [
- LIBSSL="-lssl -lcrypto"
- AC_REQUIRE([KDE_CHECK_LIB64])
-@@ -5308,7 +5308,7 @@
- AC_SUBST(LIBSSL)
- ])
-
--AC_DEFUN(KDE_CHECK_STRLCPY,
-+AC_DEFUN([KDE_CHECK_STRLCPY],
- [
- AC_REQUIRE([AC_CHECK_STRLCAT])
- AC_REQUIRE([AC_CHECK_STRLCPY])
-@@ -5329,7 +5329,7 @@
- ])
- ])
-
--AC_DEFUN(KDE_CHECK_BINUTILS,
-+AC_DEFUN([KDE_CHECK_BINUTILS],
- [
- AC_MSG_CHECKING([if ld supports unversioned version maps])
-
-@@ -5364,7 +5364,7 @@
- _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
- ])
-
--AC_DEFUN(KDE_CHECK_PERL,
-+AC_DEFUN([KDE_CHECK_PERL],
- [
- KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
- AC_MSG_ERROR([No Perl found in your $PATH.
---- admin/oldinclude.m4.in.orig 2004-01-04 15:52:07.759253264 +0100
-+++ admin/oldinclude.m4.in 2004-01-04 15:53:21.846990216 +0100
-@@ -19,7 +19,7 @@
- dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- dnl Boston, MA 02111-1307, USA.
-
--AC_DEFUN(KDE_CHECK_MICO,
-+AC_DEFUN([KDE_CHECK_MICO],
- [
- AC_REQUIRE([KDE_CHECK_LIBDL])
- AC_REQUIRE([KDE_MISC_TESTS])
-@@ -128,7 +128,7 @@
-
- ])
-
--AC_DEFUN(KDE_CHECK_MINI_STL,
-+AC_DEFUN([KDE_CHECK_MINI_STL],
- [
- AC_REQUIRE([KDE_CHECK_MICO])
-
-@@ -165,11 +165,11 @@
-
- ])
-
--AC_DEFUN(KDE_CHECK_ANSI,
-+AC_DEFUN([KDE_CHECK_ANSI],
- [
- ])
-
--AC_DEFUN(KDE_CHECK_INSURE,
-+AC_DEFUN([KDE_CHECK_INSURE],
- [
- AC_ARG_ENABLE(insure, [ --enable-insure use insure++ for debugging [default=no]],
- [
-@@ -186,7 +186,7 @@
- fi
- ])
-
--AC_DEFUN(KDE_CHECK_NEWLIBS,
-+AC_DEFUN([KDE_CHECK_NEWLIBS],
- [
-
--])
-\ Brak znaku nowej linii na koñcu pliku
-+])
projects / packages / arts.git / commitdiff