X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=autogen.sh;h=be88a8d6f37496485c23abb49c9423ed594f683c;hb=66aa6f7fbb16f441b28196c46a8c3fd60ed39d1b;hp=869632abb09886ffda98827e0ca89a94c66e9827;hpb=92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2;p=elogind.git

diff --git a/autogen.sh b/autogen.sh
index 869632abb..be88a8d6f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,17 +21,15 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activated pre-commit hook."
 fi
 
-GTKDOCIZE=`which gtkdocize`
+GTKDOCIZE=$(which gtkdocize 2>/dev/null)
 if test -z $GTKDOCIZE; then
-    echo "You don't have gtk-doc installed, and thus"
-    echo "won't be able to generate the documentation."
-    NOGTKDOC=1
+    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
 
-if test -z "$NOGTKDOC"; then
-    gtkdocize || exit $?
-fi
 intltoolize --force --automake
 autoreconf --force --install --symlink
 
@@ -44,7 +42,7 @@ args="\
 --localstatedir=/var \
 --libdir=$(libdir /usr/lib) \
 --libexecdir=/usr/lib \
---enable-gtk-doc"
+$gtkdocargs"
 
 if [ ! -L /bin ]; then
 args="$args \
@@ -53,16 +51,14 @@ args="$args \
 "
 fi
 
-if [ "x$1" != "xc" ]; then
-    echo
-    echo "----------------------------------------------------------------"
-    echo "Initialized build system. For a common configuration please run:"
-    echo "----------------------------------------------------------------"
-    echo
-    echo "./configure CFLAGS='-g -O0' $args"
-    echo
-else
-    echo ./configure CFLAGS='-g -O0' $args
-    ./configure CFLAGS='-g -O0' $args
+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
+if [ "x$1" == "xc" ]; then
+    ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
     make clean
 fi