Remove bootstrap* scripts

Let's just use autogen.sh, no need for wrapper scripts. Now
`autogen.sh c` uses the same recommended options for developing kmod and
also accepts extra arguments.

diff --git a/.travis.yml b/.travis.yml
index f3262a5746bc1e8cb3ffaabf089af19229250869..cfb09cc984d09ad0291addf5fed245f78d3d0bbe 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
       env: MYCC=gcc-4.9
     - compiler: clang
       env: MYCC=clang
-script: ./bootstrap-configure && make -j && make -j check
+script: ./autogen.sh c && make -j && make -j check
 notifications:
   irc:
     channels:

diff --git a/Makefile.am b/Makefile.am
index 194e1115ae7008bdf418591e553f3f5fe169c3ae..1ab1db58531623c8b5b2e414750ab5605d366e35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -459,7 +459,7 @@ endif
 
 kmod-coverity-%.tar.xz:
        rm -rf $< cov-int
-       ./bootstrap-configure --disable-python --disable-manpages
+       ./autogen.sh c --disable-python --disable-manpages
        make clean
        cov-build --dir cov-int make -j 4
        tar caf $@ cov-int

diff --git a/README b/README
index 04f06ce2e2e2a208b4a6a5eb294ea26536c2e5b9..414076a2876d87a9358f148c46e92225770d8840 100644 (file)
--- a/README
+++ b/README
@@ -66,8 +66,8 @@ To compile and install run:
 Hacking
 =======
 
-Run 'bootstrap' script before configure. If you want to accept the recommended
-flags, you just need to run 'bootstrap-configure'. Note that the recommended
+Run 'autogen.sh' script before configure. If you want to accept the recommended
+flags, you just need to run 'autogen.sh c'. Note that the recommended
 flags require cython be installed to compile successfully.
 
 Make sure to read the CODING-STYLE file and the other READMEs: libkmod/README

diff --git a/autogen.sh b/autogen.sh
deleted file mode 120000 (symlink)
index ac7bcbbf37b1b7f6e3ac6402a29f844f6de1ca43..0000000000000000000000000000000000000000
--- a/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-bootstrap
\ No newline at end of file

diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..e003f78395746a9b0afb7ea79ccb80f74d9590f2
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+set -e
+
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
+
+gtkdocize --docdir libkmod/docs || touch libkmod/docs/gtk-doc.make
+autoreconf --force --install --symlink
+
+libdir() {
+        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
+}
+
+args="\
+--prefix=/usr \
+--sysconfdir=/etc \
+--libdir=$(libdir /usr/lib) \
+"
+
+if [ -f "$topdir/.config.args" ]; then
+    args="$args $(cat $topdir/.config.args)"
+fi
+
+if [ ! -L /bin ]; then
+    args="$args \
+        --with-rootprefix= \
+        --with-rootlibdir=$(libdir /lib) \
+        "
+fi
+
+cd $oldpwd
+
+hackargs="--enable-debug --enable-python --with-xz --with-zlib"
+
+if [ "x$1" = "xc" ]; then
+        shift
+        $topdir/configure CFLAGS='-g -O2' $args $hackargs "$@"
+        make clean
+elif [ "x$1" = "xg" ]; then
+        shift
+        $topdir/configure CFLAGS='-g -Og' $args "$@"
+        make clean
+elif [ "x$1" = "xl" ]; then
+        shift
+        $topdir/configure CC=clang CXX=clang++ $args "$@"
+        make clean
+elif [ "x$1" = "xa" ]; then
+        shift
+        $topdir/configure CFLAGS='-g -O2 -Wsuggest-attribute=pure -Wsuggest-attribute=const' $args "$@"
+        make clean
+elif [ "x$1" = "xs" ]; then
+        shift
+        scan-build $topdir/configure CFLAGS='-g -O0 -std=gnu11' $args "$@"
+        scan-build make
+else
+        echo
+        echo "----------------------------------------------------------------"
+        echo "Initialized build system. For a common configuration please run:"
+        echo "----------------------------------------------------------------"
+        echo
+        echo "$topdir/configure CFLAGS='-g -O2' $args"
+        echo
+        echo If you are debugging or hacking on kmod, consider configuring
+        echo like below:
+        echo
+        echo "$topdir/configure CFLAGS='-g -O2' $args $hackargs"
+fi

diff --git a/bootstrap b/bootstrap
deleted file mode 100755 (executable)
index 7bc176c..0000000
--- a/bootstrap
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-set -e
-
-oldpwd=$(pwd)
-topdir=$(dirname $0)
-cd $topdir
-
-gtkdocize --docdir libkmod/docs || touch libkmod/docs/gtk-doc.make
-autoreconf --force --install --symlink
-
-libdir() {
-        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
-}
-
-args="\
---prefix=/usr \
---sysconfdir=/etc \
---libdir=$(libdir /usr/lib) \
-"
-
-if [ -f "$topdir/.config.args" ]; then
-    args="$args $(cat $topdir/.config.args)"
-fi
-
-if [ ! -L /bin ]; then
-    args="$args \
-        --with-rootprefix= \
-        --with-rootlibdir=$(libdir /lib) \
-        "
-fi
-
-cd $oldpwd
-
-hackargs="--enable-debug --enable-python --with-xz --with-zlib"
-
-if [ "x$1" = "xc" ]; then
-        $topdir/configure CFLAGS='-g -O2' $args
-        make clean
-elif [ "x$1" = "xg" ]; then
-        $topdir/configure CFLAGS='-g -Og' $args
-        make clean
-elif [ "x$1" = "xl" ]; then
-        $topdir/configure CC=clang CXX=clang++ $args
-        make clean
-elif [ "x$1" = "xa" ]; then
-        $topdir/configure CFLAGS='-g -O2 -Wsuggest-attribute=pure -Wsuggest-attribute=const' $args
-        make clean
-elif [ "x$1" = "xs" ]; then
-        scan-build $topdir/configure CFLAGS='-g -O0 -std=gnu11' $args
-        scan-build make
-else
-        echo
-        echo "----------------------------------------------------------------"
-        echo "Initialized build system. For a common configuration please run:"
-        echo "----------------------------------------------------------------"
-        echo
-        echo "$topdir/configure CFLAGS='-g -O2' $args"
-        echo
-        echo If you are debugging or hacking on kmod, consider configuring
-        echo like below:
-        echo 
-        echo "$topdir/configure CFLAGS='-g -O2' $args $hackargs"
-fi

diff --git a/bootstrap-configure b/bootstrap-configure
deleted file mode 100755 (executable)
index 33fbc2c..0000000
--- a/bootstrap-configure
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-. ./bootstrap && \
-       exec ./configure CFLAGS="-g -O2" $args $hackargs "$@"

diff --git a/testsuite/README b/testsuite/README
index 6efc61e6cd454e1573a02817c811d42767a19834..052569f0fa09af47f18956984006d05c15440473 100644 (file)
--- a/testsuite/README
+++ b/testsuite/README
@@ -58,4 +58,4 @@ pay attention when writing a test:
     too, as long as you tell them to operate on child process.
 
 9 - Make sure test passes when using "default" build flags, i.e. by running
-    bootstrap-configure instead of simpler bootstrap/autogen.sh
+    'autogen.sh c'