diff -Naur gnucash.old/acinclude.m4 gnucash/acinclude.m4 --- gnucash.old/acinclude.m4 2005-04-02 10:18:44.982243080 +0200 +++ gnucash/acinclude.m4 2005-04-02 11:15:12.324288816 +0200 @@ -3602,7 +3602,7 @@ # ----------- # Perform all the checks necessary for compilation of the ltdl objects # -- including compiler checks and header checks. -AC_DEFUN(AC_LIB_LTDL, +AC_DEFUN([AC_LIB_LTDL], [AC_PREREQ(2.13) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_C_CONST]) @@ -3635,7 +3635,7 @@ # AC_LTDL_ENABLE_INSTALL # ---------------------- -AC_DEFUN(AC_LTDL_ENABLE_INSTALL, +AC_DEFUN([AC_LTDL_ENABLE_INSTALL], [AC_ARG_ENABLE(ltdl-install, [ --enable-ltdl-install install libltdl]) @@ -3645,7 +3645,7 @@ # AC_LTDL_SYS_DLOPEN_DEPLIBS # -------------------------- -AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS, +AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([whether deplibs are loaded by dlopen], libltdl_cv_sys_dlopen_deplibs, [dnl @@ -3674,7 +3674,7 @@ # AC_LTDL_SHLIBEXT # ---------------- -AC_DEFUN(AC_LTDL_SHLIBEXT, +AC_DEFUN([AC_LTDL_SHLIBEXT], [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) AC_CACHE_CHECK([which extension is used for shared libraries], libltdl_cv_shlibext, @@ -3694,7 +3694,7 @@ # AC_LTDL_SHLIBPATH # ----------------- -AC_DEFUN(AC_LTDL_SHLIBPATH, +AC_DEFUN([AC_LTDL_SHLIBPATH], [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) AC_CACHE_CHECK([which variable specifies run-time library path], libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"]) @@ -3706,7 +3706,7 @@ # AC_LTDL_SYSSEARCHPATH # --------------------- -AC_DEFUN(AC_LTDL_SYSSEARCHPATH, +AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) AC_CACHE_CHECK([for the default library search path], libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"]) @@ -3730,7 +3730,7 @@ # AC_LTDL_OBJDIR # -------------- -AC_DEFUN(AC_LTDL_OBJDIR, +AC_DEFUN([AC_LTDL_OBJDIR], [AC_CACHE_CHECK([for objdir], libltdl_cv_objdir, [libltdl_cv_objdir="$objdir" if test -n "$objdir"; then @@ -3752,7 +3752,7 @@ # AC_LTDL_DLPREOPEN # ----------------- -AC_DEFUN(AC_LTDL_DLPREOPEN, +AC_DEFUN([AC_LTDL_DLPREOPEN], [AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], libltdl_cv_preloaded_symbols, [dnl @@ -3770,7 +3770,7 @@ # AC_LTDL_DLLIB # ------------- -AC_DEFUN(AC_LTDL_DLLIB, +AC_DEFUN([AC_LTDL_DLLIB], [LIBADD_DL= AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1, [Define if you have the libdl library or equivalent. ]) LIBADD_DL="-ldl"], @@ -3801,7 +3801,7 @@ # AC_LTDL_SYMBOL_USCORE # --------------------- -AC_DEFUN(AC_LTDL_SYMBOL_USCORE, +AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [dnl does the compiler prefix global symbols with an underscore? AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl AC_MSG_CHECKING([for _ prefix in compiled symbols]) @@ -3840,7 +3840,7 @@ # AC_LTDL_DLSYM_USCORE # -------------------- -AC_DEFUN(AC_LTDL_DLSYM_USCORE, +AC_DEFUN([AC_LTDL_DLSYM_USCORE], [AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl if test x"$ac_cv_sys_symbol_underscore" = xyes; then if test x"$ac_cv_func_dlopen" = xyes || @@ -3927,7 +3927,7 @@ dnl check whether we use the old or new guile smobs -AC_DEFUN(AC_GWRAP_CHECK_GUILE, +AC_DEFUN([AC_GWRAP_CHECK_GUILE], [if test x$GUILE = x ; then AC_PATH_PROG(GUILE, guile, no) fi @@ -3951,7 +3951,7 @@ dnl tests for minimum and maximum versions of g-wrap. dnl sets G_WRAP_CONFIG and GWRAP_OLD_GUILE_SMOB if needed. -AC_DEFUN(AM_PATH_GWRAP, +AC_DEFUN([AM_PATH_GWRAP], [dnl dnl dnl @@ -4041,7 +4041,7 @@ dnl tests for minimum and maximum versions of guile. -AC_DEFUN(AM_GUILE_VERSION_CHECK, +AC_DEFUN([AM_GUILE_VERSION_CHECK], [ dnl dnl @@ -4121,7 +4121,7 @@ dnl AM_PATH_LIBGUPPI([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for LIBGUPPI, and define LIBGUPPI_CFLAGS and LIBGUPPI_LIBS dnl -AC_DEFUN(AM_PATH_LIBGUPPI, +AC_DEFUN([AM_PATH_LIBGUPPI], [dnl dnl Get the cflags and libraries from the gnome-config script dnl diff -Naur gnucash.old/configure.in gnucash/configure.in --- gnucash.old/configure.in 2005-04-02 10:26:33.266053120 +0200 +++ gnucash/configure.in 2005-04-02 10:26:56.688492368 +0200 @@ -747,7 +747,7 @@ # check for doxygen, mostly stolen from http://log4cpp.sourceforge.net/ # ---------------------------------------------------------------------------- -AC_DEFUN(BB_ENABLE_DOXYGEN, +AC_DEFUN([BB_ENABLE_DOXYGEN], [ AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) diff -Naur gnucash.old/macros/aqbanking.m4 gnucash/macros/aqbanking.m4 --- gnucash.old/macros/aqbanking.m4 2005-04-02 10:18:44.983242928 +0200 +++ gnucash/macros/aqbanking.m4 2005-04-02 10:27:56.609383008 +0200 @@ -2,7 +2,7 @@ # (c) 2004 Martin Preuss # This function checks for AqBanking -AC_DEFUN(AC_AQBANKING, [ +AC_DEFUN([AC_AQBANKING], [ dnl searches for aqbanking dnl Arguments: dnl $1: major version minimum diff -Naur gnucash.old/macros/as-scrub-include.m4 gnucash/macros/as-scrub-include.m4 --- gnucash.old/macros/as-scrub-include.m4 2005-04-02 10:18:44.983242928 +0200 +++ gnucash/macros/as-scrub-include.m4 2005-04-02 10:27:35.440601152 +0200 @@ -17,7 +17,7 @@ dnl AS_SCRUB_INCLUDE(CFLAGS) dnl will remove all system include dirs from the given CFLAGS -AC_DEFUN(AS_SCRUB_INCLUDE, +AC_DEFUN([AS_SCRUB_INCLUDE], [ GIVEN_CFLAGS=$[$1] INCLUDE_DIRS=`echo | cpp -v 2>&1` diff -Naur gnucash.old/macros/openhbci.m4 gnucash/macros/openhbci.m4 --- gnucash.old/macros/openhbci.m4 2005-04-02 10:18:44.984242776 +0200 +++ gnucash/macros/openhbci.m4 2005-04-02 10:25:14.976954872 +0200 @@ -5,7 +5,7 @@ dnl AM_PATH_OPENHBCI([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for OPENHBCI, and define OPENHBCI_CFLAGS, OPENHBCI_CXXFLAGS and OPENHBCI_LIBS dnl -AC_DEFUN(AM_PATH_OPENHBCI, [ +AC_DEFUN([AM_PATH_OPENHBCI], [ dnl dnl Get the c[xx]flags and libraries from openhbci-config dnl