From c527759701d3583b2c2117b50a92ec067f180adc Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Wed, 23 Jan 2013 16:06:35 +0100
Subject: [PATCH] zz60-xc-ovr.m4: tighten XC_OVR_ZZ60 macro placement
 requirements

---
 m4/zz60-xc-ovr.m4 | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/m4/zz60-xc-ovr.m4 b/m4/zz60-xc-ovr.m4
index 2122f5a31..959f11883 100644
--- a/m4/zz60-xc-ovr.m4
+++ b/m4/zz60-xc-ovr.m4
@@ -38,7 +38,9 @@ dnl this macro is used in configure.ac, with autoconf
 dnl 2.57 or older.
 
 m4_ifdef([AC_CONFIG_MACRO_DIR],
-  [m4_undefine([AC_CONFIG_MACRO_DIR])])
+[dnl
+m4_undefine([AC_CONFIG_MACRO_DIR])dnl
+])
 m4_define([AC_CONFIG_MACRO_DIR],[])
 
 
@@ -50,6 +52,13 @@ dnl used for same configure script, overriding those
 dnl provided elsewhere.
 
 AC_DEFUN([XC_OVR_ZZ60],
-  [AC_BEFORE([$0],[AC_PROG_LIBTOOL])
-   AC_BEFORE([$0],[AM_INIT_AUTOMAKE])])
+[dnl
+AC_BEFORE([$0],[LT_INIT])dnl
+AC_BEFORE([$0],[AM_INIT_AUTOMAKE])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_WIN32_DLL])dnl
+AC_BEFORE([$0],[AC_PROG_LIBTOOL])dnl
+dnl
+AC_BEFORE([$0],[AC_CONFIG_MACRO_DIR])dnl
+AC_BEFORE([$0],[AC_CONFIG_MACRO_DIRS])dnl
+])