Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-…

…daemon
apache · Jul 12, 2024 · 44fd3ec · 44fd3ec
2 parents 4f17a5d + 70bf9c3
commit 44fd3ec
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3,585 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,8 @@
 /src/native/unix/native/*.o
 /src/native/unix/native/Makefile
 /src/native/unix/native/libservice.a
+/src/native/unix/support/config.guess
+/src/native/unix/support/config.sub
 /src/native/windows/apps/prunmgr/*_GUI_RELEASE
 /src/native/windows/apps/prunsrv/*_RELEASE
 /target/

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -44,6 +44,9 @@
       <action dev="michaelo" type="fix">
         Fix several issues around Java OS and header files location detection.
       </action>
+      <action dev="michaelo" type="update">
+        Remove autogenerated files and rely on autoreconf only.
+      </action>
     </release>
     <release version="1.4.0" date="2024-05-24" description="Bug fix release">
       <!-- Fix -->

diff --git a/src/native/unix/support/buildconf.sh b/src/native/unix/support/buildconf.sh
@@ -19,7 +19,7 @@
 rm -rf autom4te.cache
 
 if test -f configure.in ; then
-  autoconf
+  autoreconf -fi
   if test $? -ne 0 ; then
     echo "$0: cannot generate configure script"
   else