chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: require $XDG_RUNTIME_DIR to be set for user instances
[elogind.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index bec43fad74e62f7e3741f8be90a8014519c99d45..9869c156ae80f668a1edce627e4a6b5cd2930f63 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.
#
@@
-17,26
+17,27
@@
set -e
set -e
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+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
+if which gtkdocize >/dev/null 2>/dev/null; then
+ gtkdocize --docdir docs/ --flavour no-tmpl
+ gtkdocargs=--enable-gtk-doc
+else
echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
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
echo 'EXTRA_DIST =' > docs/gtk-doc.make
-else
- gtkdocize --docdir docs/
- gtkdocargs=--enable-gtk-doc
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="\
}
args="\
@@
-52,8
+53,11
@@
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
+elif [ "x$1" = "xg" ]; then
+ ./configure CFLAGS='-g -Og' $args
make clean
else
echo
make clean
else
echo
@@
-61,6
+65,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