autotools: Support AC_CONFIG_MACROS_DIRS

Add support for the new (in autoconf 2.69) AC_CONFIG_MACRO_DIRS macro to
the existing support for the older AC_CONFIG_MACRO_DIR macro.

cygclass/autotools.cygclass

@@ -311,7 +311,7 @@ cygautoreconf() {
 			then
 				__parse_aclocal_amflags $(grep '^ACLOCAL_AMFLAGS' Makefile.am | sed 's/=/ = /') | xargs -r mkdir -p
 			fi
-			grep '^[^\#]*AC_CONFIG_MACRO_DIR' ${sub_configure_ac} | sed -e "s!.*AC_CONFIG_MACRO_DIR(\[*\(.*\))!${d}/\1!g" -e 's!\]*!!g' | xargs -r mkdir -p
+			grep '^[^\#]*AC_CONFIG_MACRO_DIRS*' ${sub_configure_ac} | sed -e "s!.*AC_CONFIG_MACRO_DIRS*(\[*\(.*\))!${d}/\1!g" -e 's!\]*!!g' | xargs -r mkdir -p
 
 			if [ ! -f ${d}/aclocal.m4 ] || $(head -n 1 ${d}/aclocal.m4 | grep -q 'generated.* by aclocal')
 			then

cygclass/gnome2.cygclass

@@ -181,7 +181,7 @@ gnome2_autoreconf() {
 	fi
 
 	# aclocal requires that its directories exist
-	sed -n -e 's|^AC_CONFIG_MACRO_DIR(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
+	sed -n -e 's|^AC_CONFIG_MACRO_DIRS*(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
 
 	# Automake will exit if these are not present
 	# dodoc won't install these, however, if they are empty

cygclass/mate.cygclass

@@ -202,7 +202,7 @@ mate_autoreconf() {
 	fi
 
 	# aclocal requires that its directories exist
-	sed -n -e 's|^AC_CONFIG_MACRO_DIR(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
+	sed -n -e 's|^AC_CONFIG_MACRO_DIR*(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
 
 	# Automake will exit if these are not present
 	# dodoc won't install these, however, if they are empty

cygclass/xfce4.cygclass

@@ -137,7 +137,7 @@ xfce4_autoreconf() {
 
 	export WANT_AUTOMAKE
 
-	sed -n -e 's|^AC_CONFIG_MACRO_DIR(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
+	sed -n -e 's|^AC_CONFIG_MACRO_DIR*(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
 
 	NOCONFIGURE=1 \
 	XDT_PROG_ACLOCAL=aclocal \