avoid aclocal 'expanded before it was required' warnings

[[Imported from SVN: r5768]]

bin/dunecontrol

@@ -642,26 +642,12 @@ m4_define([DUNE_AC_INIT],[
   AC_SUBST([DUNE_MOD_NAME], [$name])
   AC_SUBST([DUNE_MAINTAINER_NAME], [$maintainer])
   DUNE_PARSE_MODULE_VERSION([$name], [$version])
-  # don't build shared libs per default, this is way better for debugging...
-  m4_ifdef([LT_INIT],
-    [LT_INIT([disable-shared])],
-    [AC_DEFUN([LT_OUTPUT])])
-  AC_DISABLE_SHARED
-#  LT_INIT([disable-shared])
-
   REQUIRES="$requires"
   AC_SUBST(REQUIRES, [$REQUIRES])
+  AC_CONFIG_MACRO_DIR([m4])
 ])
 
 AC_DEFUN([DUNE_CHECK_MOD_DEPENDENCIES], [
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_PROG_CPP])
-  AC_REQUIRE([AC_PROG_CXX])
-#  AC_REQUIRE([AC_PROG_CXXCPP])
-  AC_REQUIRE([AC_PROG_LIBTOOL])
-#  AC_REQUIRE([AC_LIBTOOL_LANG_CXX_CONFIG])
-#  m4_ifdef([],[AC_LIBTOOL_LANG_CXX_CONFIG])
 EOF
       ### initialize AM_CONDITIONAL for suggestions that were not found
       for name in $(eval echo \$SUGS_$mainmod); do

m4/dune_all.m4

@@ -19,6 +19,22 @@ AC_DEFUN([DUNE_CHECK_ALL],[
   AS_IF([test "x$enabledist" = "xyes"],[
     AM_CONDITIONAL(DUNEWEB, false)])
 
+  dnl check the compilers
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_CXX])
+  AC_REQUIRE([AC_PROG_CXXCPP])
+  AC_REQUIRE([AC_PROG_F77])
+  AC_REQUIRE([AC_PROG_LIBTOOL])
+  # don't build shared libs per default, this is way better for debugging...
+  m4_ifdef([LT_INIT], [],
+  [
+    AC_DEFUN([LT_OUTPUT])
+    AC_DEFUN([LT_INIT], [AC_DISABLE_SHARED])
+  ])
+  LT_INIT([disable-shared])
+
   dnl check dependencies of this module
   dnl this test is autogenerated for each module
   AC_REQUIRE([DUNE_CHECK_MOD_DEPENDENCIES])