btrfs-progs: fi usage: print device id column in the tabular output<F2>

[platform/upstream/btrfs-progs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cbad099..c3a22d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,17 @@ AC_INIT([btrfs-progs],
        [linux-btrfs@vger.kernel.org],,
        [http://btrfs.wiki.kernel.org])
 
+if test "x$PACKAGE_URL" = "x"; then
+       AC_DEFINE([PACKAGE_URL], ["http://btrfs.wiki.kernel.org"], [URL])
+fi
+
 dnl library version
 LIBBTRFS_MAJOR=0
 LIBBTRFS_MINOR=1
 LIBBTRFS_PATCHLEVEL=1
 
-CFLAGS="-g -O1"
+CFLAGS=${CFLAGS:-"-g -O1 -Wall -D_FORTIFY_SOURCE=2"}
+AC_SUBST([CFLAGS])
 
 AC_PREREQ([2.60])
 
@@ -93,13 +98,13 @@ fi
 
 AC_ARG_ENABLE([convert],
              AS_HELP_STRING([--disable-convert], [do not build btrfs-convert]),
-  [], [enable_btrfsconvert=yes]
+  [], [enable_convert=yes]
 )
 
-AS_IF([test "x$enable_btrfsconvert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1])
+AS_IF([test "x$enable_convert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1])
 AC_SUBST([DISABLE_BTRFSCONVERT])
 
-if test "x$enable_btrfsconvert" = xyes; then
+if test "x$enable_convert" = xyes; then
        PKG_CHECK_MODULES(EXT2FS, [ext2fs])
        PKG_CHECK_MODULES(COM_ERR, [com_err])
 fi
@@ -160,9 +165,9 @@ AC_MSG_RESULT([
        cflags:            ${CFLAGS}
        ldflags:           ${LDFLAGS}
 
-       documentaton:      ${enable_documentation}
+       documentation:     ${enable_documentation}
        backtrace support: ${enable_backtrace}
-       btrfs-convert:     ${enable_btrfsconvert}
+       btrfs-convert:     ${enable_convert}
 
        Type 'make' to compile.
 ])