mirror of https://github.com/vitalif/e2fsprogs
configure.in: use AC_MSG_{RESULT,WARN,ERROR} instead of echo
This gives us standard behavior when using flags such as --quiet, and gives us standard warning output when showing warnings and errors. Addresses-Sourceforge-Patches: #2058794 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>bitmap-optimize
Theodore Ts'o
parent
2d40a91e17
commit
02d04db494
|
|
@ -1896,7 +1896,8 @@ Sep) MONTH_NUM=09; E2FSPROGS_MONTH="September" ;;
|
|||
Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
|
||||
Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
|
||||
Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
|
||||
*) echo "Unknown month $MONTH??" ;;
|
||||
*) { echo "$as_me:$LINENO: WARNING: Unknown month $MONTH??" >&5
|
||||
echo "$as_me: WARNING: Unknown month $MONTH??" >&2;} ;;
|
||||
esac
|
||||
|
||||
base_ver=`echo $E2FSPROGS_VERSION | \
|
||||
|
|
@ -1914,8 +1915,10 @@ case $E2FSPROGS_VERSION in
|
|||
esac
|
||||
|
||||
unset DATE MONTH YEAR base_ver pre_vers date_spec
|
||||
echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION"
|
||||
echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
|
||||
{ echo "$as_me:$LINENO: result: Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&5
|
||||
echo "${ECHO_T}Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&6; }
|
||||
{ echo "$as_me:$LINENO: result: Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&5
|
||||
echo "${ECHO_T}Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&6; }
|
||||
|
||||
|
||||
|
||||
|
|
@ -3780,15 +3783,18 @@ if test "${enable_maintainer_mode+set}" = set; then
|
|||
enableval=$enable_maintainer_mode; if test "$enableval" = "no"
|
||||
then
|
||||
MAINTAINER_CMT=#
|
||||
echo "Disabling maintainer mode"
|
||||
{ echo "$as_me:$LINENO: result: Disabling maintainer mode" >&5
|
||||
echo "${ECHO_T}Disabling maintainer mode" >&6; }
|
||||
else
|
||||
MAINTAINER_CMT=
|
||||
echo "Enabling maintainer mode"
|
||||
{ echo "$as_me:$LINENO: result: Enabling maintainer mode" >&5
|
||||
echo "${ECHO_T}Enabling maintainer mode" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
MAINTAINER_CMT=#
|
||||
echo "Disabling maintainer mode by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling maintainer mode by default" >&5
|
||||
echo "${ECHO_T}Disabling maintainer mode by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3797,18 +3803,22 @@ fi
|
|||
if test "${enable_compression+set}" = set; then
|
||||
enableval=$enable_compression; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling compression support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling compression support" >&5
|
||||
echo "${ECHO_T}Disabling compression support" >&6; }
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define ENABLE_COMPRESSION 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling compression support"
|
||||
echo "WARNING: Compression support is experimental"
|
||||
{ echo "$as_me:$LINENO: result: Enabling compression support" >&5
|
||||
echo "${ECHO_T}Enabling compression support" >&6; }
|
||||
{ echo "$as_me:$LINENO: WARNING: Compression support is experimental" >&5
|
||||
echo "$as_me: WARNING: Compression support is experimental" >&2;}
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Disabling compression support by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling compression support by default" >&5
|
||||
echo "${ECHO_T}Disabling compression support by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3817,14 +3827,16 @@ if test "${enable_htree+set}" = set; then
|
|||
enableval=$enable_htree; if test "$enableval" = "no"
|
||||
then
|
||||
HTREE_CMT=#
|
||||
echo "Disabling htree directory support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling htree directory support" >&5
|
||||
echo "${ECHO_T}Disabling htree directory support" >&6; }
|
||||
else
|
||||
HTREE_CMT=
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define ENABLE_HTREE 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling htree directory support"
|
||||
{ echo "$as_me:$LINENO: result: Enabling htree directory support" >&5
|
||||
echo "${ECHO_T}Enabling htree directory support" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
|
|
@ -3833,7 +3845,8 @@ cat >>confdefs.h <<\_ACEOF
|
|||
#define ENABLE_HTREE 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling htree directory support by default"
|
||||
{ echo "$as_me:$LINENO: result: Enabling htree directory support by default" >&5
|
||||
echo "${ECHO_T}Enabling htree directory support by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3845,7 +3858,8 @@ if test "${enable_elf_shlibs+set}" = set; then
|
|||
then
|
||||
ELF_CMT=#
|
||||
MAKEFILE_ELF=/dev/null
|
||||
echo "Disabling ELF shared libraries"
|
||||
{ echo "$as_me:$LINENO: result: Disabling ELF shared libraries" >&5
|
||||
echo "${ECHO_T}Disabling ELF shared libraries" >&6; }
|
||||
else
|
||||
E2_PKG_CONFIG_STATIC=
|
||||
ELF_CMT=
|
||||
|
|
@ -3857,13 +3871,15 @@ else
|
|||
esac
|
||||
BINARY_TYPE=elfbin
|
||||
LIB_EXT=.so
|
||||
echo "Enabling ELF shared libraries"
|
||||
{ echo "$as_me:$LINENO: result: Enabling ELF shared libraries" >&5
|
||||
echo "${ECHO_T}Enabling ELF shared libraries" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
MAKEFILE_ELF=/dev/null
|
||||
ELF_CMT=#
|
||||
echo "Disabling ELF shared libraries by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling ELF shared libraries by default" >&5
|
||||
echo "${ECHO_T}Disabling ELF shared libraries by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3875,7 +3891,8 @@ if test "${enable_bsd_shlibs+set}" = set; then
|
|||
then
|
||||
BSDLIB_CMT=#
|
||||
MAKEFILE_BSDLIB=/dev/null
|
||||
echo "Disabling BSD shared libraries"
|
||||
{ echo "$as_me:$LINENO: result: Disabling BSD shared libraries" >&5
|
||||
echo "${ECHO_T}Disabling BSD shared libraries" >&6; }
|
||||
else
|
||||
E2_PKG_CONFIG_STATIC=
|
||||
BSDLIB_CMT=
|
||||
|
|
@ -3887,13 +3904,15 @@ else
|
|||
LIB_EXT=.dylib
|
||||
;;
|
||||
esac
|
||||
echo "Enabling BSD shared libraries"
|
||||
{ echo "$as_me:$LINENO: result: Enabling BSD shared libraries" >&5
|
||||
echo "${ECHO_T}Enabling BSD shared libraries" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
MAKEFILE_BSDLIB=/dev/null
|
||||
BSDLIB_CMT=#
|
||||
echo "Disabling BSD shared libraries by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling BSD shared libraries by default" >&5
|
||||
echo "${ECHO_T}Disabling BSD shared libraries by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3905,18 +3924,21 @@ if test "${enable_profile+set}" = set; then
|
|||
then
|
||||
PROFILE_CMT=#
|
||||
MAKEFILE_PROFILE=/dev/null
|
||||
echo "Disabling profiling libraries"
|
||||
{ echo "$as_me:$LINENO: result: Disabling profiling libraries" >&5
|
||||
echo "${ECHO_T}Disabling profiling libraries" >&6; }
|
||||
else
|
||||
PROFILE_CMT=
|
||||
MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
|
||||
PROFILED_LIB_EXT=_p.a
|
||||
echo "Building profiling libraries"
|
||||
{ echo "$as_me:$LINENO: result: Building profiling libraries" >&5
|
||||
echo "${ECHO_T}Building profiling libraries" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
PROFILE_CMT=#
|
||||
MAKEFILE_PROFILE=/dev/null
|
||||
echo "Disabling profiling libraries by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling profiling libraries by default" >&5
|
||||
echo "${ECHO_T}Disabling profiling libraries by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3928,17 +3950,20 @@ if test "${enable_checker+set}" = set; then
|
|||
then
|
||||
CHECKER_CMT=#
|
||||
MAKEFILE_CHECKER=/dev/null
|
||||
echo "Disabling checker libraries"
|
||||
{ echo "$as_me:$LINENO: result: Disabling checker libraries" >&5
|
||||
echo "${ECHO_T}Disabling checker libraries" >&6; }
|
||||
else
|
||||
CHECKER_CMT=
|
||||
MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
|
||||
echo "Building checker libraries"
|
||||
{ echo "$as_me:$LINENO: result: Building checker libraries" >&5
|
||||
echo "${ECHO_T}Building checker libraries" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
CHECKER_CMT=#
|
||||
MAKEFILE_CHECKER=/dev/null
|
||||
echo "Disabling checker libraries by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling checker libraries by default" >&5
|
||||
echo "${ECHO_T}Disabling checker libraries by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3951,17 +3976,20 @@ fi
|
|||
if test "${enable_jbd_debug+set}" = set; then
|
||||
enableval=$enable_jbd_debug; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling journal debugging"
|
||||
{ echo "$as_me:$LINENO: result: Disabling journal debugging" >&5
|
||||
echo "${ECHO_T}Disabling journal debugging" >&6; }
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define CONFIG_JBD_DEBUG 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling journal debugging"
|
||||
{ echo "$as_me:$LINENO: result: Enabling journal debugging" >&5
|
||||
echo "${ECHO_T}Enabling journal debugging" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Disabling journal debugging by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling journal debugging by default" >&5
|
||||
echo "${ECHO_T}Disabling journal debugging by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3969,17 +3997,20 @@ fi
|
|||
if test "${enable_blkid_debug+set}" = set; then
|
||||
enableval=$enable_blkid_debug; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling blkid debugging"
|
||||
{ echo "$as_me:$LINENO: result: Disabling blkid debugging" >&5
|
||||
echo "${ECHO_T}Disabling blkid debugging" >&6; }
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define CONFIG_BLKID_DEBUG 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling blkid debugging"
|
||||
{ echo "$as_me:$LINENO: result: Enabling blkid debugging" >&5
|
||||
echo "${ECHO_T}Enabling blkid debugging" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Disabling blkid debugging by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling blkid debugging by default" >&5
|
||||
echo "${ECHO_T}Disabling blkid debugging by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3987,17 +4018,20 @@ fi
|
|||
if test "${enable_testio_debug+set}" = set; then
|
||||
enableval=$enable_testio_debug; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling testio debugging"
|
||||
{ echo "$as_me:$LINENO: result: Disabling testio debugging" >&5
|
||||
echo "${ECHO_T}Disabling testio debugging" >&6; }
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define CONFIG_TESTIO_DEBUG 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling testio debugging"
|
||||
{ echo "$as_me:$LINENO: result: Enabling testio debugging" >&5
|
||||
echo "${ECHO_T}Enabling testio debugging" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Disabling testio debugging by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling testio debugging by default" >&5
|
||||
echo "${ECHO_T}Disabling testio debugging by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -4005,15 +4039,18 @@ fi
|
|||
if test "${enable_debugfs+set}" = set; then
|
||||
enableval=$enable_debugfs; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling debugfs support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling debugfs support" >&5
|
||||
echo "${ECHO_T}Disabling debugfs support" >&6; }
|
||||
DEBUGFS_CMT="#"
|
||||
else
|
||||
DEBUGFS_CMT=
|
||||
echo "Enabling debugfs support"
|
||||
{ echo "$as_me:$LINENO: result: Enabling debugfs support" >&5
|
||||
echo "${ECHO_T}Enabling debugfs support" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Enabling debugfs support by default"
|
||||
{ echo "$as_me:$LINENO: result: Enabling debugfs support by default" >&5
|
||||
echo "${ECHO_T}Enabling debugfs support by default" >&6; }
|
||||
DEBUGFS_CMT=
|
||||
|
||||
fi
|
||||
|
|
@ -4023,15 +4060,18 @@ fi
|
|||
if test "${enable_imager+set}" = set; then
|
||||
enableval=$enable_imager; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling e2image support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling e2image support" >&5
|
||||
echo "${ECHO_T}Disabling e2image support" >&6; }
|
||||
IMAGER_CMT="#"
|
||||
else
|
||||
IMAGER_CMT=
|
||||
echo "Enabling e2image support"
|
||||
{ echo "$as_me:$LINENO: result: Enabling e2image support" >&5
|
||||
echo "${ECHO_T}Enabling e2image support" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Enabling e2image support by default"
|
||||
{ echo "$as_me:$LINENO: result: Enabling e2image support by default" >&5
|
||||
echo "${ECHO_T}Enabling e2image support by default" >&6; }
|
||||
IMAGER_CMT=
|
||||
|
||||
fi
|
||||
|
|
@ -4041,15 +4081,18 @@ fi
|
|||
if test "${enable_resizer+set}" = set; then
|
||||
enableval=$enable_resizer; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling e2resize support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling e2resize support" >&5
|
||||
echo "${ECHO_T}Disabling e2resize support" >&6; }
|
||||
RESIZER_CMT="#"
|
||||
else
|
||||
RESIZER_CMT=
|
||||
echo "Enabling e2resize support"
|
||||
{ echo "$as_me:$LINENO: result: Enabling e2resize support" >&5
|
||||
echo "${ECHO_T}Enabling e2resize support" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
echo "Enabling e2resize support by default"
|
||||
{ echo "$as_me:$LINENO: result: Enabling e2resize support by default" >&5
|
||||
echo "${ECHO_T}Enabling e2resize support by default" >&6; }
|
||||
RESIZER_CMT=
|
||||
|
||||
fi
|
||||
|
|
@ -4060,21 +4103,25 @@ if test "${enable_fsck+set}" = set; then
|
|||
enableval=$enable_fsck; if test "$enableval" = "no"
|
||||
then
|
||||
FSCK_PROG='' FSCK_MAN=''
|
||||
echo "Not building fsck wrapper"
|
||||
{ echo "$as_me:$LINENO: result: Not building fsck wrapper" >&5
|
||||
echo "${ECHO_T}Not building fsck wrapper" >&6; }
|
||||
else
|
||||
FSCK_PROG=fsck FSCK_MAN=fsck.8
|
||||
echo "Building fsck wrapper"
|
||||
{ echo "$as_me:$LINENO: result: Building fsck wrapper" >&5
|
||||
echo "${ECHO_T}Building fsck wrapper" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
case "$host_os" in
|
||||
gnu*)
|
||||
FSCK_PROG='' FSCK_MAN=''
|
||||
echo "Not building fsck wrapper by default"
|
||||
{ echo "$as_me:$LINENO: result: Not building fsck wrapper by default" >&5
|
||||
echo "${ECHO_T}Not building fsck wrapper by default" >&6; }
|
||||
;;
|
||||
*)
|
||||
FSCK_PROG=fsck FSCK_MAN=fsck.8
|
||||
echo "Building fsck wrapper by default"
|
||||
{ echo "$as_me:$LINENO: result: Building fsck wrapper by default" >&5
|
||||
echo "${ECHO_T}Building fsck wrapper by default" >&6; }
|
||||
esac
|
||||
|
||||
fi
|
||||
|
|
@ -4086,15 +4133,18 @@ if test "${enable_e2initrd_helper+set}" = set; then
|
|||
enableval=$enable_e2initrd_helper; if test "$enableval" = "no"
|
||||
then
|
||||
E2INITRD_PROG='' E2INITRD_MAN=''
|
||||
echo "Not building e2initrd helper"
|
||||
{ echo "$as_me:$LINENO: result: Not building e2initrd helper" >&5
|
||||
echo "${ECHO_T}Not building e2initrd helper" >&6; }
|
||||
else
|
||||
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
|
||||
echo "Building e2initrd helper"
|
||||
{ echo "$as_me:$LINENO: result: Building e2initrd helper" >&5
|
||||
echo "${ECHO_T}Building e2initrd helper" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
|
||||
echo "Building e2initrd helper by default"
|
||||
{ echo "$as_me:$LINENO: result: Building e2initrd helper by default" >&5
|
||||
echo "${ECHO_T}Building e2initrd helper by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -4105,7 +4155,8 @@ STATIC_BLKID_DEVMAPPER_LIBS=''
|
|||
if test "${enable_blkid_devmapper+set}" = set; then
|
||||
enableval=$enable_blkid_devmapper; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling device-mapper support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling device-mapper support" >&5
|
||||
echo "${ECHO_T}Disabling device-mapper support" >&6; }
|
||||
DEVMAPPER_REQ=''
|
||||
DEVMAPPER_LIBS=''
|
||||
STATIC_DEVMAPPER_LIBS=''
|
||||
|
|
@ -4114,7 +4165,8 @@ else
|
|||
#define HAVE_DEVMAPPER 1
|
||||
_ACEOF
|
||||
|
||||
echo "Enabling device-mapper support"
|
||||
{ echo "$as_me:$LINENO: result: Enabling device-mapper support" >&5
|
||||
echo "${ECHO_T}Enabling device-mapper support" >&6; }
|
||||
|
||||
|
||||
|
||||
|
|
@ -4238,8 +4290,9 @@ echo "${ECHO_T}no" >&6; }
|
|||
fi
|
||||
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
echo "pkg-config not installed; please install it."
|
||||
exit 1;
|
||||
{ { echo "$as_me:$LINENO: error: pkg-config not installed; please install it." >&5
|
||||
echo "$as_me: error: pkg-config not installed; please install it." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for dm_tree_create in -ldevmapper" >&5
|
||||
|
|
@ -4319,7 +4372,8 @@ fi
|
|||
*pthread*)
|
||||
;;
|
||||
*)
|
||||
echo "Working around Debian bug #390243..."
|
||||
{ echo "$as_me:$LINENO: WARNING: Working around Debian bug 390243..." >&5
|
||||
echo "$as_me: WARNING: Working around Debian bug 390243..." >&2;}
|
||||
STATIC_DEVMAPPER_LIBS="-pthread $STATIC_DEVMAPPER_LIBS"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -4330,7 +4384,8 @@ fi
|
|||
fi
|
||||
|
||||
else
|
||||
echo "Disabling device-mapper support by default"
|
||||
{ echo "$as_me:$LINENO: result: Disabling device-mapper support by default" >&5
|
||||
echo "${ECHO_T}Disabling device-mapper support by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -4344,20 +4399,24 @@ if test "${enable_tls+set}" = set; then
|
|||
enableval=$enable_tls; if test "$enableval" = "no"
|
||||
then
|
||||
try_tls=""
|
||||
echo "Disabling thread local support"
|
||||
{ echo "$as_me:$LINENO: result: Disabling thread local support" >&5
|
||||
echo "${ECHO_T}Disabling thread local support" >&6; }
|
||||
else
|
||||
try_tls="yes"
|
||||
echo "Enabling thread local support"
|
||||
{ echo "$as_me:$LINENO: result: Enabling thread local support" >&5
|
||||
echo "${ECHO_T}Enabling thread local support" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
if test -n "$WITH_DIET_LIBC"
|
||||
then
|
||||
try_tls=""
|
||||
echo "Diet libc does not support thread local support"
|
||||
{ echo "$as_me:$LINENO: result: Diet libc does not support thread local support" >&5
|
||||
echo "${ECHO_T}Diet libc does not support thread local support" >&6; }
|
||||
else
|
||||
try_tls="yes"
|
||||
echo "Try using thread local support by default"
|
||||
{ echo "$as_me:$LINENO: result: Try using thread local support by default" >&5
|
||||
echo "${ECHO_T}Try using thread local support by default" >&6; }
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
@ -4444,7 +4503,8 @@ fi
|
|||
if test "${enable_uuidd+set}" = set; then
|
||||
enableval=$enable_uuidd; if test "$enableval" = "no"
|
||||
then
|
||||
echo "Not building uuidd"
|
||||
{ echo "$as_me:$LINENO: result: Not building uuidd" >&5
|
||||
echo "${ECHO_T}Not building uuidd" >&6; }
|
||||
UUIDD_CMT="#"
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
|
|
@ -4452,7 +4512,8 @@ else
|
|||
_ACEOF
|
||||
|
||||
UUIDD_CMT=""
|
||||
echo "Building uuidd"
|
||||
{ echo "$as_me:$LINENO: result: Building uuidd" >&5
|
||||
echo "${ECHO_T}Building uuidd" >&6; }
|
||||
fi
|
||||
|
||||
else
|
||||
|
|
@ -4461,7 +4522,8 @@ else
|
|||
_ACEOF
|
||||
|
||||
UUIDD_CMT=""
|
||||
echo "Building uuidd by default"
|
||||
{ echo "$as_me:$LINENO: result: Building uuidd by default" >&5
|
||||
echo "${ECHO_T}Building uuidd by default" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -15184,7 +15246,8 @@ case "$host_os" in
|
|||
linux* | gnu* | k*bsd*-gnu)
|
||||
if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
|
||||
root_prefix="";
|
||||
echo "On $host_os systems, root_prefix defaults to ''"
|
||||
{ echo "$as_me:$LINENO: result: On $host_os systems, root_prefix defaults to ''" >&5
|
||||
echo "${ECHO_T}On $host_os systems, root_prefix defaults to ''" >&6; }
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
@ -15192,9 +15255,11 @@ case "$host_os" in
|
|||
linux* | gnu* | k*bsd*-gnu)
|
||||
if test "$prefix" = NONE ; then
|
||||
prefix="/usr";
|
||||
echo "On $host_os systems, prefix defaults to /usr"
|
||||
{ echo "$as_me:$LINENO: result: On $host_os systems, prefix defaults to /usr" >&5
|
||||
echo "${ECHO_T}On $host_os systems, prefix defaults to /usr" >&6; }
|
||||
if test "$mandir" = '${prefix}/man' ; then
|
||||
echo "...and mandir defaults to /usr/share/man"
|
||||
{ echo "$as_me:$LINENO: result: ...and mandir defaults to /usr/share/man" >&5
|
||||
echo "${ECHO_T}...and mandir defaults to /usr/share/man" >&6; }
|
||||
mandir=/usr/share/man
|
||||
fi
|
||||
fi
|
||||
|
|
@ -15218,19 +15283,23 @@ else
|
|||
fi
|
||||
if test "$bindir" != '${exec_prefix}/bin'; then
|
||||
root_bindir=$bindir
|
||||
echo "Setting root_bindir to $root_bindir"
|
||||
{ echo "$as_me:$LINENO: result: Setting root_bindir to $root_bindir" >&5
|
||||
echo "${ECHO_T}Setting root_bindir to $root_bindir" >&6; }
|
||||
fi
|
||||
if test "$sbindir" != '${exec_prefix}/sbin'; then
|
||||
root_sbindir=$sbindir
|
||||
echo "Setting root_sbindir to $root_sbindir"
|
||||
{ echo "$as_me:$LINENO: result: Setting root_sbindir to $root_sbindir" >&5
|
||||
echo "${ECHO_T}Setting root_sbindir to $root_sbindir" >&6; }
|
||||
fi
|
||||
if test "$libdir" != '${exec_prefix}/lib'; then
|
||||
root_libdir=$libdir
|
||||
echo "Setting root_libdir to $root_libdir"
|
||||
{ echo "$as_me:$LINENO: result: Setting root_libdir to $root_libdir" >&5
|
||||
echo "${ECHO_T}Setting root_libdir to $root_libdir" >&6; }
|
||||
fi
|
||||
if test "$sysconfdir" != '${prefix}/etc'; then
|
||||
root_sysconfdir=$sysconfdir
|
||||
echo "Setting root_sysconfdir to $root_sysconfdir"
|
||||
{ echo "$as_me:$LINENO: result: Setting root_sysconfdir to $root_sysconfdir" >&5
|
||||
echo "${ECHO_T}Setting root_sysconfdir to $root_sysconfdir" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -15303,7 +15372,8 @@ fi
|
|||
|
||||
case "$host_os" in
|
||||
darwin*)
|
||||
echo "Using Apple Darwin / GNU libintl workaround"
|
||||
{ echo "$as_me:$LINENO: result: Using Apple Darwin / GNU libintl workaround" >&5
|
||||
echo "${ECHO_T}Using Apple Darwin / GNU libintl workaround" >&6; }
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define _INTL_REDIRECT_MACROS 1
|
||||
_ACEOF
|
||||
|
|
|
|||
141
configure.in
141
configure.in
|
|
@ -36,7 +36,7 @@ Sep) MONTH_NUM=09; E2FSPROGS_MONTH="September" ;;
|
|||
Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
|
||||
Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
|
||||
Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
|
||||
*) echo "Unknown month $MONTH??" ;;
|
||||
*) AC_MSG_WARN([Unknown month $MONTH??]) ;;
|
||||
esac
|
||||
|
||||
base_ver=`echo $E2FSPROGS_VERSION | \
|
||||
|
|
@ -54,8 +54,8 @@ case $E2FSPROGS_VERSION in
|
|||
esac
|
||||
|
||||
unset DATE MONTH YEAR base_ver pre_vers date_spec
|
||||
echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION"
|
||||
echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
|
||||
AC_MSG_RESULT([Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION])
|
||||
AC_MSG_RESULT([Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}])
|
||||
AC_SUBST(E2FSPROGS_YEAR)
|
||||
AC_SUBST(E2FSPROGS_MONTH)
|
||||
AC_SUBST(E2FSPROGS_DAY)
|
||||
|
|
@ -161,14 +161,14 @@ AC_ARG_ENABLE([maintainer-mode],
|
|||
if test "$enableval" = "no"
|
||||
then
|
||||
MAINTAINER_CMT=#
|
||||
echo "Disabling maintainer mode"
|
||||
AC_MSG_RESULT([Disabling maintainer mode])
|
||||
else
|
||||
MAINTAINER_CMT=
|
||||
echo "Enabling maintainer mode"
|
||||
AC_MSG_RESULT([Enabling maintainer mode])
|
||||
fi
|
||||
,
|
||||
MAINTAINER_CMT=#
|
||||
echo "Disabling maintainer mode by default"
|
||||
AC_MSG_RESULT([Disabling maintainer mode by default])
|
||||
)
|
||||
AC_SUBST(MAINTAINER_CMT)
|
||||
dnl
|
||||
|
|
@ -178,14 +178,14 @@ AC_ARG_ENABLE([compression],
|
|||
[ --enable-compression enable EXPERIMENTAL compression support],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling compression support"
|
||||
AC_MSG_RESULT([Disabling compression support])
|
||||
else
|
||||
AC_DEFINE(ENABLE_COMPRESSION)
|
||||
echo "Enabling compression support"
|
||||
echo "WARNING: Compression support is experimental"
|
||||
AC_MSG_RESULT([Enabling compression support])
|
||||
AC_MSG_WARN([Compression support is experimental])
|
||||
fi
|
||||
,
|
||||
echo "Disabling compression support by default"
|
||||
AC_MSG_RESULT([Disabling compression support by default])
|
||||
)
|
||||
dnl
|
||||
dnl handle --enable-htree
|
||||
|
|
@ -195,16 +195,16 @@ AC_ARG_ENABLE([htree],
|
|||
if test "$enableval" = "no"
|
||||
then
|
||||
HTREE_CMT=#
|
||||
echo "Disabling htree directory support"
|
||||
AC_MSG_RESULT([Disabling htree directory support])
|
||||
else
|
||||
HTREE_CMT=
|
||||
AC_DEFINE(ENABLE_HTREE)
|
||||
echo "Enabling htree directory support"
|
||||
AC_MSG_RESULT([Enabling htree directory support])
|
||||
fi
|
||||
,
|
||||
HTREE_CMT=
|
||||
AC_DEFINE(ENABLE_HTREE)
|
||||
echo "Enabling htree directory support by default"
|
||||
AC_MSG_RESULT([Enabling htree directory support by default])
|
||||
)
|
||||
AC_SUBST(HTREE_CMT)
|
||||
dnl
|
||||
|
|
@ -220,7 +220,7 @@ if test "$enableval" = "no"
|
|||
then
|
||||
ELF_CMT=#
|
||||
MAKEFILE_ELF=/dev/null
|
||||
echo "Disabling ELF shared libraries"
|
||||
AC_MSG_RESULT([Disabling ELF shared libraries])
|
||||
else
|
||||
E2_PKG_CONFIG_STATIC=
|
||||
ELF_CMT=
|
||||
|
|
@ -232,12 +232,12 @@ else
|
|||
esac]
|
||||
BINARY_TYPE=elfbin
|
||||
LIB_EXT=.so
|
||||
echo "Enabling ELF shared libraries"
|
||||
AC_MSG_RESULT([Enabling ELF shared libraries])
|
||||
fi
|
||||
,
|
||||
MAKEFILE_ELF=/dev/null
|
||||
ELF_CMT=#
|
||||
echo "Disabling ELF shared libraries by default"
|
||||
AC_MSG_RESULT([Disabling ELF shared libraries by default])
|
||||
)
|
||||
AC_SUBST(ELF_CMT)
|
||||
AC_SUBST_FILE(MAKEFILE_ELF)
|
||||
|
|
@ -250,7 +250,7 @@ if test "$enableval" = "no"
|
|||
then
|
||||
BSDLIB_CMT=#
|
||||
MAKEFILE_BSDLIB=/dev/null
|
||||
echo "Disabling BSD shared libraries"
|
||||
AC_MSG_RESULT([Disabling BSD shared libraries])
|
||||
else
|
||||
E2_PKG_CONFIG_STATIC=
|
||||
BSDLIB_CMT=
|
||||
|
|
@ -262,12 +262,12 @@ else
|
|||
LIB_EXT=.dylib
|
||||
;;
|
||||
esac]
|
||||
echo "Enabling BSD shared libraries"
|
||||
AC_MSG_RESULT([Enabling BSD shared libraries])
|
||||
fi
|
||||
,
|
||||
MAKEFILE_BSDLIB=/dev/null
|
||||
BSDLIB_CMT=#
|
||||
echo "Disabling BSD shared libraries by default"
|
||||
AC_MSG_RESULT([Disabling BSD shared libraries by default])
|
||||
)
|
||||
AC_SUBST(BSDLIB_CMT)
|
||||
AC_SUBST_FILE(MAKEFILE_BSDLIB)
|
||||
|
|
@ -280,17 +280,17 @@ if test "$enableval" = "no"
|
|||
then
|
||||
PROFILE_CMT=#
|
||||
MAKEFILE_PROFILE=/dev/null
|
||||
echo "Disabling profiling libraries"
|
||||
AC_MSG_RESULT([Disabling profiling libraries])
|
||||
else
|
||||
PROFILE_CMT=
|
||||
MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
|
||||
PROFILED_LIB_EXT=_p.a
|
||||
echo "Building profiling libraries"
|
||||
AC_MSG_RESULT([Building profiling libraries])
|
||||
fi
|
||||
,
|
||||
PROFILE_CMT=#
|
||||
MAKEFILE_PROFILE=/dev/null
|
||||
echo "Disabling profiling libraries by default"
|
||||
AC_MSG_RESULT([Disabling profiling libraries by default])
|
||||
)
|
||||
AC_SUBST(PROFILE_CMT)
|
||||
AC_SUBST_FILE(MAKEFILE_PROFILE)
|
||||
|
|
@ -303,16 +303,16 @@ if test "$enableval" = "no"
|
|||
then
|
||||
CHECKER_CMT=#
|
||||
MAKEFILE_CHECKER=/dev/null
|
||||
echo "Disabling checker libraries"
|
||||
AC_MSG_RESULT([Disabling checker libraries])
|
||||
else
|
||||
CHECKER_CMT=
|
||||
MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
|
||||
echo "Building checker libraries"
|
||||
AC_MSG_RESULT([Building checker libraries])
|
||||
fi
|
||||
,
|
||||
CHECKER_CMT=#
|
||||
MAKEFILE_CHECKER=/dev/null
|
||||
echo "Disabling checker libraries by default"
|
||||
AC_MSG_RESULT([Disabling checker libraries by default])
|
||||
)
|
||||
AC_SUBST(CHECKER_CMT)
|
||||
AC_SUBST_FILE(MAKEFILE_CHECKER)
|
||||
|
|
@ -329,13 +329,13 @@ AC_ARG_ENABLE([jbd-debug],
|
|||
[ --enable-jbd-debug enable journal debugging],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling journal debugging"
|
||||
AC_MSG_RESULT([Disabling journal debugging])
|
||||
else
|
||||
AC_DEFINE(CONFIG_JBD_DEBUG)
|
||||
echo "Enabling journal debugging"
|
||||
AC_MSG_RESULT([Enabling journal debugging])
|
||||
fi
|
||||
,
|
||||
echo "Disabling journal debugging by default"
|
||||
AC_MSG_RESULT([Disabling journal debugging by default])
|
||||
)
|
||||
dnl
|
||||
dnl handle --enable-blkid-debug
|
||||
|
|
@ -344,13 +344,13 @@ AC_ARG_ENABLE([blkid-debug],
|
|||
[ --enable-blkid-debug enable blkid debugging],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling blkid debugging"
|
||||
AC_MSG_RESULT([Disabling blkid debugging])
|
||||
else
|
||||
AC_DEFINE(CONFIG_BLKID_DEBUG)
|
||||
echo "Enabling blkid debugging"
|
||||
AC_MSG_RESULT([Enabling blkid debugging])
|
||||
fi
|
||||
,
|
||||
echo "Disabling blkid debugging by default"
|
||||
AC_MSG_RESULT([Disabling blkid debugging by default])
|
||||
)
|
||||
dnl
|
||||
dnl handle --enable-testio-debug
|
||||
|
|
@ -359,13 +359,13 @@ AC_ARG_ENABLE([testio-debug],
|
|||
[ --enable-testio-debug enable the use of the test I/O manager for debugging],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling testio debugging"
|
||||
AC_MSG_RESULT([Disabling testio debugging])
|
||||
else
|
||||
AC_DEFINE(CONFIG_TESTIO_DEBUG)
|
||||
echo "Enabling testio debugging"
|
||||
AC_MSG_RESULT([Enabling testio debugging])
|
||||
fi
|
||||
,
|
||||
echo "Disabling testio debugging by default"
|
||||
AC_MSG_RESULT([Disabling testio debugging by default])
|
||||
)
|
||||
dnl
|
||||
dnl handle --enable-debugfs
|
||||
|
|
@ -374,14 +374,14 @@ AC_ARG_ENABLE([debugfs],
|
|||
[ --disable-debugfs disable support of debugfs program],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling debugfs support"
|
||||
AC_MSG_RESULT([Disabling debugfs support])
|
||||
DEBUGFS_CMT="#"
|
||||
else
|
||||
DEBUGFS_CMT=
|
||||
echo "Enabling debugfs support"
|
||||
AC_MSG_RESULT([Enabling debugfs support])
|
||||
fi
|
||||
,
|
||||
echo "Enabling debugfs support by default"
|
||||
AC_MSG_RESULT([Enabling debugfs support by default])
|
||||
DEBUGFS_CMT=
|
||||
)
|
||||
AC_SUBST(DEBUGFS_CMT)
|
||||
|
|
@ -392,14 +392,14 @@ AC_ARG_ENABLE([imager],
|
|||
[ --disable-imager disable support of e2image program],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling e2image support"
|
||||
AC_MSG_RESULT([Disabling e2image support])
|
||||
IMAGER_CMT="#"
|
||||
else
|
||||
IMAGER_CMT=
|
||||
echo "Enabling e2image support"
|
||||
AC_MSG_RESULT([Enabling e2image support])
|
||||
fi
|
||||
,
|
||||
echo "Enabling e2image support by default"
|
||||
AC_MSG_RESULT([Enabling e2image support by default])
|
||||
IMAGER_CMT=
|
||||
)
|
||||
AC_SUBST(IMAGER_CMT)
|
||||
|
|
@ -410,14 +410,14 @@ AC_ARG_ENABLE([resizer],
|
|||
[ --disable-resizer disable support of e2resize program],
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling e2resize support"
|
||||
AC_MSG_RESULT([Disabling e2resize support])
|
||||
RESIZER_CMT="#"
|
||||
else
|
||||
RESIZER_CMT=
|
||||
echo "Enabling e2resize support"
|
||||
AC_MSG_RESULT([Enabling e2resize support])
|
||||
fi
|
||||
,
|
||||
echo "Enabling e2resize support by default"
|
||||
AC_MSG_RESULT([Enabling e2resize support by default])
|
||||
RESIZER_CMT=
|
||||
)
|
||||
AC_SUBST(RESIZER_CMT)
|
||||
|
|
@ -429,20 +429,20 @@ AC_ARG_ENABLE([fsck],
|
|||
[if test "$enableval" = "no"
|
||||
then
|
||||
FSCK_PROG='' FSCK_MAN=''
|
||||
echo "Not building fsck wrapper"
|
||||
AC_MSG_RESULT([Not building fsck wrapper])
|
||||
else
|
||||
FSCK_PROG=fsck FSCK_MAN=fsck.8
|
||||
echo "Building fsck wrapper"
|
||||
AC_MSG_RESULT([Building fsck wrapper])
|
||||
fi]
|
||||
,
|
||||
[case "$host_os" in
|
||||
gnu*)
|
||||
FSCK_PROG='' FSCK_MAN=''
|
||||
echo "Not building fsck wrapper by default"
|
||||
AC_MSG_RESULT([Not building fsck wrapper by default])
|
||||
;;
|
||||
*)
|
||||
FSCK_PROG=fsck FSCK_MAN=fsck.8
|
||||
echo "Building fsck wrapper by default"
|
||||
AC_MSG_RESULT([Building fsck wrapper by default])
|
||||
esac]
|
||||
)
|
||||
AC_SUBST(FSCK_PROG)
|
||||
|
|
@ -455,14 +455,14 @@ AC_ARG_ENABLE([e2initrd-helper],
|
|||
[if test "$enableval" = "no"
|
||||
then
|
||||
E2INITRD_PROG='' E2INITRD_MAN=''
|
||||
echo "Not building e2initrd helper"
|
||||
AC_MSG_RESULT([Not building e2initrd helper])
|
||||
else
|
||||
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
|
||||
echo "Building e2initrd helper"
|
||||
AC_MSG_RESULT([Building e2initrd helper])
|
||||
fi]
|
||||
,
|
||||
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
|
||||
echo "Building e2initrd helper by default"
|
||||
AC_MSG_RESULT([Building e2initrd helper by default])
|
||||
)
|
||||
AC_SUBST(E2INITRD_PROG)
|
||||
AC_SUBST(E2INITRD_MAN)
|
||||
|
|
@ -473,19 +473,18 @@ AC_ARG_ENABLE([blkid-devmapper],
|
|||
[ --enable-blkid-devmapper build with device-mapper support],
|
||||
[if test "$enableval" = "no"
|
||||
then
|
||||
echo "Disabling device-mapper support"
|
||||
AC_MSG_RESULT([Disabling device-mapper support])
|
||||
DEVMAPPER_REQ=''
|
||||
DEVMAPPER_LIBS=''
|
||||
STATIC_DEVMAPPER_LIBS=''
|
||||
else
|
||||
AC_DEFINE(HAVE_DEVMAPPER)
|
||||
echo "Enabling device-mapper support"
|
||||
AC_MSG_RESULT([Enabling device-mapper support])
|
||||
|
||||
PKG_PROG_PKG_CONFIG()
|
||||
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
echo "pkg-config not installed; please install it."
|
||||
exit 1;
|
||||
AC_MSG_ERROR([pkg-config not installed; please install it.])
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(devmapper, dm_tree_create,
|
||||
|
|
@ -500,7 +499,7 @@ else
|
|||
*pthread*)
|
||||
;;
|
||||
*)
|
||||
echo "Working around Debian bug #390243..."
|
||||
AC_MSG_WARN([Working around Debian bug 390243...])
|
||||
STATIC_DEVMAPPER_LIBS="-pthread $STATIC_DEVMAPPER_LIBS"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -510,7 +509,7 @@ else
|
|||
fi
|
||||
fi]
|
||||
,
|
||||
echo "Disabling device-mapper support by default"
|
||||
AC_MSG_RESULT([Disabling device-mapper support by default])
|
||||
)
|
||||
AC_SUBST(DEVMAPPER_REQ)
|
||||
AC_SUBST(DEVMAPPER_PC_LIBS)
|
||||
|
|
@ -525,19 +524,19 @@ AC_ARG_ENABLE([tls],
|
|||
[if test "$enableval" = "no"
|
||||
then
|
||||
try_tls=""
|
||||
echo "Disabling thread local support"
|
||||
AC_MSG_RESULT([Disabling thread local support])
|
||||
else
|
||||
try_tls="yes"
|
||||
echo "Enabling thread local support"
|
||||
AC_MSG_RESULT([Enabling thread local support])
|
||||
fi]
|
||||
,
|
||||
if test -n "$WITH_DIET_LIBC"
|
||||
then
|
||||
try_tls=""
|
||||
echo "Diet libc does not support thread local support"
|
||||
AC_MSG_RESULT([Diet libc does not support thread local support])
|
||||
else
|
||||
try_tls="yes"
|
||||
echo "Try using thread local support by default"
|
||||
AC_MSG_RESULT([Try using thread local support by default])
|
||||
fi
|
||||
)
|
||||
if test "$try_tls" = "yes"
|
||||
|
|
@ -551,17 +550,17 @@ AC_ARG_ENABLE([uuidd],
|
|||
[ --disable-uuidd disable building the uuid daemon],
|
||||
[if test "$enableval" = "no"
|
||||
then
|
||||
echo "Not building uuidd"
|
||||
AC_MSG_RESULT([Not building uuidd])
|
||||
UUIDD_CMT="#"
|
||||
else
|
||||
AC_DEFINE(USE_UUIDD)
|
||||
UUIDD_CMT=""
|
||||
echo "Building uuidd"
|
||||
AC_MSG_RESULT([Building uuidd])
|
||||
fi]
|
||||
,
|
||||
AC_DEFINE(USE_UUIDD)
|
||||
UUIDD_CMT=""
|
||||
echo "Building uuidd by default"
|
||||
AC_MSG_RESULT([Building uuidd by default])
|
||||
)
|
||||
AC_SUBST(UUIDD_CMT)
|
||||
dnl
|
||||
|
|
@ -812,7 +811,7 @@ case "$host_os" in
|
|||
linux* | gnu* | k*bsd*-gnu)
|
||||
if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
|
||||
root_prefix="";
|
||||
echo "On $host_os systems, root_prefix defaults to ''"
|
||||
AC_MSG_RESULT([On $host_os systems, root_prefix defaults to ''])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
@ -823,9 +822,9 @@ case "$host_os" in
|
|||
linux* | gnu* | k*bsd*-gnu)
|
||||
if test "$prefix" = NONE ; then
|
||||
prefix="/usr";
|
||||
echo "On $host_os systems, prefix defaults to /usr"
|
||||
AC_MSG_RESULT([On $host_os systems, prefix defaults to /usr])
|
||||
if test "$mandir" = '${prefix}/man' ; then
|
||||
echo "...and mandir defaults to /usr/share/man"
|
||||
AC_MSG_RESULT([...and mandir defaults to /usr/share/man])
|
||||
mandir=/usr/share/man
|
||||
fi
|
||||
fi
|
||||
|
|
@ -849,19 +848,19 @@ else
|
|||
fi
|
||||
if test "$bindir" != '${exec_prefix}/bin'; then
|
||||
root_bindir=$bindir
|
||||
echo "Setting root_bindir to $root_bindir"
|
||||
AC_MSG_RESULT([Setting root_bindir to $root_bindir])
|
||||
fi
|
||||
if test "$sbindir" != '${exec_prefix}/sbin'; then
|
||||
root_sbindir=$sbindir
|
||||
echo "Setting root_sbindir to $root_sbindir"
|
||||
AC_MSG_RESULT([Setting root_sbindir to $root_sbindir])
|
||||
fi
|
||||
if test "$libdir" != '${exec_prefix}/lib'; then
|
||||
root_libdir=$libdir
|
||||
echo "Setting root_libdir to $root_libdir"
|
||||
AC_MSG_RESULT([Setting root_libdir to $root_libdir])
|
||||
fi
|
||||
if test "$sysconfdir" != '${prefix}/etc'; then
|
||||
root_sysconfdir=$sysconfdir
|
||||
echo "Setting root_sysconfdir to $root_sysconfdir"
|
||||
AC_MSG_RESULT([Setting root_sysconfdir to $root_sysconfdir])
|
||||
fi
|
||||
AC_SUBST(root_prefix)
|
||||
AC_SUBST(root_bindir)
|
||||
|
|
@ -902,7 +901,7 @@ dnl Apple hacked gcc somehow?)
|
|||
dnl
|
||||
case "$host_os" in
|
||||
darwin*)
|
||||
echo "Using Apple Darwin / GNU libintl workaround"
|
||||
AC_MSG_RESULT([Using Apple Darwin / GNU libintl workaround])
|
||||
AC_DEFINE(_INTL_REDIRECT_MACROS)
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Reference in New Issue