From 1d5076c4825eb42586a75ead3dbdcf2a8533b0c7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 May 2012 11:37:11 +0200
Subject: build-sys: rename bootstrap to autogen to follow usual semantics

---
 autogen.sh   | 43 +++++++++++++++++++++++++++++++++++++++----
 bootstrap.sh | 60 ------------------------------------------------------------
 2 files changed, 39 insertions(+), 64 deletions(-)
 delete mode 100755 bootstrap.sh

diff --git a/autogen.sh b/autogen.sh
index e784d3a..8531ac4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # This file is part of libcanberra.
 #
@@ -18,8 +18,43 @@
 # License along with libcanberra. If not, see
 # <http://www.gnu.org/licenses/>.
 
-# Only there to make jhbuild and Marc-Andre happy
+if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+        cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
+        chmod +x .git/hooks/pre-commit && \
+        echo "Activated pre-commit hook."
+fi
 
-NOCONFIGURE=1 ./bootstrap.sh
+GTKDOCIZE=$(which gtkdocize 2>/dev/null)
+if test -z $GTKDOCIZE; then
+        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
+        echo 'EXTRA_DIST =' > gtk-doc.make
+else
+        gtkdocize
+        gtkdocargs=--enable-gtk-doc
+fi
 
-exec ./configure  "$@"
+autoreconf --force --install --symlink
+
+libdir() {
+        echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
+
+args="\
+--sysconfdir=/etc \
+--localstatedir=/var \
+--libdir=$(libdir /usr/lib) \
+--libexecdir=/usr/lib \
+$gtkdocargs"
+
+if [ "x$1" == "xc" ]; then
+        ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
+        make clean
+else
+        echo
+        echo "----------------------------------------------------------------"
+        echo "Initialized build system. For a common configuration please run:"
+        echo "----------------------------------------------------------------"
+        echo
+        echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args"
+        echo
+fi
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index 8531ac4..0000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# This file is part of libcanberra.
-#
-# Copyright 2008 Lennart Poettering
-#
-# libcanberra is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# libcanberra is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with libcanberra. If not, see
-# <http://www.gnu.org/licenses/>.
-
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
-        cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
-        chmod +x .git/hooks/pre-commit && \
-        echo "Activated pre-commit hook."
-fi
-
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
-        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
-        echo 'EXTRA_DIST =' > gtk-doc.make
-else
-        gtkdocize
-        gtkdocargs=--enable-gtk-doc
-fi
-
-autoreconf --force --install --symlink
-
-libdir() {
-        echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
-}
-
-args="\
---sysconfdir=/etc \
---localstatedir=/var \
---libdir=$(libdir /usr/lib) \
---libexecdir=/usr/lib \
-$gtkdocargs"
-
-if [ "x$1" == "xc" ]; then
-        ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
-        make clean
-else
-        echo
-        echo "----------------------------------------------------------------"
-        echo "Initialized build system. For a common configuration please run:"
-        echo "----------------------------------------------------------------"
-        echo
-        echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args"
-        echo
-fi
-- 
cgit