Update bootstrap script for gnulib

Assisted-by: Cursor

Author: twaugh

bootstrap

@@ -1,6 +1,17 @@
 #! /bin/sh
 
-echo "Deleting all autogenerated stuff..."
+set -e
+
+echo "Bootstrap: Setting up patchutils build environment..."
+
+# Check if we need to update gnulib files
+update_gnulib=false
+if [ "$1" = "--update-gnulib" ] || [ "$1" = "-u" ]; then
+    update_gnulib=true
+    echo "Updating gnulib modules..."
+fi
+
+echo "Cleaning autogenerated files..."
 
 rm -f *.o *.so config.sub config.guess config.cache
 rm -f config.log config.h config.status config.h.in
@@ -14,6 +25,37 @@ rm -rf autom4te.cache/
 rm -f INSTALL
 rm -f test-driver
 
+# Update gnulib if requested or if gnulib files seem missing/outdated
+if [ "$update_gnulib" = true ] || [ ! -f "lib/Makefile.am" ] || [ ! -f "m4/gnulib-comp.m4" ]; then
+    echo "Updating gnulib modules..."
+
+    # Try to use system gnulib-tool first
+    if command -v gnulib-tool >/dev/null 2>&1; then
+        echo "Using system gnulib-tool..."
+        if ! gnulib-tool --update 2>/dev/null; then
+            echo "System gnulib-tool failed, trying alternative approach..."
+            # Fallback to downloading gnulib if system tool doesn't work
+            if [ ! -d "/tmp/gnulib" ]; then
+                echo "Downloading gnulib..."
+                git clone --depth 1 https://git.savannah.gnu.org/git/gnulib.git /tmp/gnulib
+            fi
+            /tmp/gnulib/gnulib-tool --update
+        fi
+    else
+        echo "gnulib-tool not found, downloading gnulib..."
+        if [ ! -d "/tmp/gnulib" ]; then
+            git clone --depth 1 https://git.savannah.gnu.org/git/gnulib.git /tmp/gnulib
+        fi
+        /tmp/gnulib/gnulib-tool --update
+    fi
+    echo "Gnulib modules updated."
+fi
+
+echo "Running autoreconf..."
 autoreconf --install --verbose
 
+echo ""
+echo "Bootstrap completed successfully!"
 echo "Now you may run ./configure"
+echo ""
+echo "Tip: Use './bootstrap --update-gnulib' to update gnulib modules"

lib/Makefile

@@ -42,7 +42,7 @@
 #  --m4-base=m4 \
 #  --doc-base=doc \
 #  --tests-base=tests \
-#  --aux-dir=build-aux \
+#  --aux-dir=. \
 #  --no-conditional-dependencies \
 #  --no-libtool \
 #  --macro-prefix=gl \

m4/gnulib-cache.m4

@@ -33,7 +33,7 @@
 #  --m4-base=m4 \
 #  --doc-base=doc \
 #  --tests-base=tests \
-#  --aux-dir=build-aux \
+#  --aux-dir=. \
 #  --no-conditional-dependencies \
 #  --no-libtool \
 #  --macro-prefix=gl \