chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: add --bind= and --bind-ro= to bind mount host paths into the container
[elogind.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index 0b5d9b557f24bf3e205cd3d5a41a7b53bcd4c88f..86fe9b3785a27453e4808ed861aeff82a970005b 100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-1,4
+1,4
@@
-#!/bin/
ba
sh
+#!/bin/sh
# This file is part of systemd.
#
# This file is part of systemd.
#
@@
-15,33
+15,35
@@
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+set -e
+
+if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
+ # This part is allowed to fail
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
chmod +x .git/hooks/pre-commit && \
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
chmod +x .git/hooks/pre-commit && \
- echo "Activated pre-commit hook."
+ echo "Activated pre-commit hook."
|| :
fi
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 =' > docs/gtk-doc.make
-else
+if which gtkdocize >/dev/null 2>/dev/null; then
gtkdocize --docdir docs/
gtkdocargs=--enable-gtk-doc
gtkdocize --docdir docs/
gtkdocargs=--enable-gtk-doc
+else
+ echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
+ rm -f docs/gtk-doc.make
+ echo 'EXTRA_DIST =' > docs/gtk-doc.make
fi
intltoolize --force --automake
autoreconf --force --install --symlink
libdir() {
fi
intltoolize --force --automake
autoreconf --force --install --symlink
libdir() {
- echo $(cd
$1/$(gcc -print-multi-os-directory)
; pwd)
+ echo $(cd
"$1/$(gcc -print-multi-os-directory)"
; pwd)
}
args="\
--sysconfdir=/etc \
--localstatedir=/var \
--libdir=$(libdir /usr/lib) \
}
args="\
--sysconfdir=/etc \
--localstatedir=/var \
--libdir=$(libdir /usr/lib) \
---libexecdir=/usr/lib \
$gtkdocargs"
if [ ! -L /bin ]; then
$gtkdocargs"
if [ ! -L /bin ]; then
@@
-51,8
+53,8
@@
args="$args \
"
fi
"
fi
-if [ "x$1" =
=
"xc" ]; then
- ./configure CFLAGS='-g -O0
-Wp,-U_FORTIFY_SOURCE
' $args
+if [ "x$1" = "xc" ]; then
+ ./configure CFLAGS='-g -O0' $args
make clean
else
echo
make clean
else
echo
@@
-60,6
+62,6
@@
else
echo "Initialized build system. For a common configuration please run:"
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 "./configure CFLAGS='-g -O0' $args"
echo
fi
echo
fi