Add %cygwin_autoreconf

4 files changed, 24 insertions, 27 deletions

diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec
index f71456b..36ada38 100644
--- a/cygwin-filesystem.spec
+++ b/cygwin-filesystem.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           cygwin-filesystem
-Version:        10
+Version:        11
 Release:        1%{?dist}
 Summary:        Cygwin cross compiler base filesystem and environment
 
@@ -241,6 +241,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/
 
 
 %changelog
+* Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 11-1
+- Add %%cygwin_autoreconf
+
 * Sun Jun 30 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 10-1
 - Fix %%cygwin_find_lang.
 
diff --git a/macros.cygwin b/macros.cygwin
index 85aedd6..b77b46d 100644
--- a/macros.cygwin
+++ b/macros.cygwin
@@ -36,6 +36,24 @@
 %global __debug_install_post %%{cygwin_debug_install_post}    \
 %{nil}
 
+%cygwin_autoreconf \
+  if [ -x %{_bindir}/cygwin-libtoolize ]; then \
+    LIBTOOLIZE=%{_bindir}/cygwin-libtoolize; export LIBTOOLIZE; \
+    ACLOCAL_FLAGS="-I %{_datadir}/cygwin-libtool/m4"; \
+  fi; \
+  if [ -d %{cygwin32_datadir}/aclocal ]; then \
+    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I %{cygwin32_datadir}/aclocal"; \
+  fi; \
+  if [ -d %{cygwin64_datadir}/aclocal ]; then \
+    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I %{cygwin64_datadir}/aclocal"; \
+  fi; \
+  ACLOCAL="%{_bindir}/aclocal $ACLOCAL_FLAGS"; export ACLOCAL;
+  if [ -x %{cygwin32_bindir}/autopoint ]; then \
+    eval gettext_`grep '^version=' %{cygwin32_bindir}/autopoint`; \
+    AUTOPOINT="%{cygwin32_bindir}/autopoint -V $gettext_version" ; export AUTOPOINT; \
+  fi; \
+  autoreconf -fiv
+
 %cygwin_configure                                      \
 run_cygwin_configure()                                 \
 {                                                      \
diff --git a/macros.cygwin32 b/macros.cygwin32
index 971deea..7330796 100644
--- a/macros.cygwin32
+++ b/macros.cygwin32
@@ -109,23 +109,11 @@ package or when debugging this package. \
     declare -x $x="$i" ; export $x; \
     declare -x ac_cv_path_$x="$i" ; export ac_cv_path_$x; \
   done; \
-  if [ -d %{cygwin32_datadir}/aclocal ]; then \
-    ACLOCAL_FLAGS="-I %{cygwin32_datadir}/aclocal"; export ACLOCAL_FLAGS; \
-    ACLOCAL="%{_bindir}/aclocal $ACLOCAL_FLAGS"; export ACLOCAL; \
-  fi; \
-  if [ -x %{cygwin32_bindir}/autopoint ]; then \
-    eval gettext_`grep '^version=' %{cygwin32_bindir}/autopoint`; \
-    AUTOPOINT="%{cygwin32_bindir}/autopoint -V $gettext_version" ; export AUTOPOINT; \
-  fi; \
-  if [ -x %{cygwin32_bindir}/libtoolize ]; then \
-    LIBTOOLIZE=%{cygwin32_bindir}/libtoolize; export LIBTOOLIZE; \
-  fi; \
   unset x i
 
 %cygwin32_pkg_config %{cygwin32_target}-pkg-config
 
-%cygwin32_autoreconf %{cygwin32_env} ; \
-  autoreconf -f -i -I %{cygwin32_datadir}/aclocal
+%cygwin32_autoreconf %{cygwin_autoreconf}
 
 %cygwin32_configure %{cygwin32_env} ; \
   unset PKG_CONFIG_LIBDIR PKG_CONFIG_SYSTEM_INCLUDE_PATH PKG_CONFIG_SYSTEM_LIBRARY_PATH; \\\
diff --git a/macros.cygwin64 b/macros.cygwin64
index 81f33b9..92b0d83 100644
--- a/macros.cygwin64
+++ b/macros.cygwin64
@@ -110,23 +110,11 @@ package or when debugging this package. \
     declare -x $x="$i" ; export $x; \
     declare -x ac_cv_path_$x="$i" ; export ac_cv_path_$x; \
   done; \
-  if [ -d %{cygwin64_datadir}/aclocal ]; then \
-    ACLOCAL_FLAGS="-I %{cygwin64_datadir}/aclocal"; export ACLOCAL_FLAGS; \
-    ACLOCAL="%{_bindir}/aclocal $ACLOCAL_FLAGS"; export ACLOCAL; \
-  fi; \
-  if [ -x %{cygwin64_bindir}/autopoint ]; then \
-    eval gettext_`grep '^version=' %{cygwin64_bindir}/autopoint`; \
-    AUTOPOINT="%{cygwin64_bindir}/autopoint -V $gettext_version" ; export AUTOPOINT; \
-  fi; \
-  if [ -x %{cygwin64_bindir}/libtoolize ]; then \
-    LIBTOOLIZE=%{cygwin64_bindir}/libtoolize; export LIBTOOLIZE; \
-  fi; \
   unset x i
 
 %cygwin64_pkg_config %{cygwin64_target}-pkg-config
 
-%cygwin64_autoreconf %{cygwin64_env} ; \
-  autoreconf -f -i -I %{cygwin64_datadir}/aclocal
+%cygwin64_autoreconf %{cygwin_autoreconf}
 
 %cygwin64_configure %{cygwin64_env} ; \
   unset PKG_CONFIG_LIBDIR PKG_CONFIG_SYSTEM_INCLUDE_PATH PKG_CONFIG_SYSTEM_LIBRARY_PATH; \\\