X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.in;h=dbec6926f6a4314a7d66330235ead0b012473978;hb=7515a7447836708241b2b30ca7d70d1257265e75;hp=e434454a44ab0cb8ef71d92e1652326837f98151;hpb=a5dda0542283d0674f42a0d1b04d33888f512eab;p=tools%2Fe2fsprogs.git

diff --git a/configure.in b/configure.in
index e434454..dbec692 100644
--- a/configure.in
+++ b/configure.in
@@ -36,18 +36,17 @@ 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 | \
 	       sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS//'`
-pre_vers=`echo $base_ver 0.01 - p | dc`
 
 date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
 
 case $E2FSPROGS_VERSION in
 *-WIP|pre-*)
-	E2FSPROGS_PKGVER="$pre_vers+${base_ver}_WIP_$date_spec"
+	E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
 	;;
 *)
 	E2FSPROGS_PKGVER="$base_ver"
@@ -55,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)
@@ -66,9 +65,11 @@ AC_CANONICAL_HOST
 dnl
 dnl Use diet libc
 dnl 
+WITH_DIET_LIBC=
 AC_ARG_WITH([diet-libc],
-[  --with-diet-libc      Use diet libc],
+[  --with-diet-libc        use diet libc],
 CC="diet cc -nostdinc"
+WITH_DIET_LIBC=yes
 AC_MSG_RESULT(CC=$CC))dnl
 dnl
 dnl set $(CC) from --with-cc=value
@@ -143,7 +144,7 @@ AC_ARG_WITH([ldopts],
 [  --with-ldopts=LDOPTS    select linker command line options],
 AC_MSG_RESULT(LDFLAGS is $withval)
 LDFLAGS=$withval,
-LDFLAGS=)dnl
+)dnl
 AC_SUBST(LDFLAGS)
 dnl
 dnl Allow separate `root_prefix' to be specified
@@ -160,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
@@ -177,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
@@ -194,19 +195,23 @@ 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
+dnl This needs to be before all of the --enable-*-shlibs options
+dnl
+E2_PKG_CONFIG_STATIC=--static
+dnl
 dnl handle --enable-elf-shlibs
 dnl
 AC_ARG_ENABLE([elf-shlibs],
@@ -215,8 +220,9 @@ 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=
 	MAKEFILE_ELF=$srcdir/lib/Makefile.elf-lib
 	[case "$host_os" in
@@ -226,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)
@@ -244,8 +250,9 @@ 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=
 	MAKEFILE_BSDLIB=$srcdir/lib/Makefile.bsd-lib
 	LIB_EXT=.so
@@ -255,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)
@@ -273,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)
@@ -296,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)
@@ -322,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
@@ -337,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
@@ -352,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
@@ -367,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)
@@ -385,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)
@@ -403,36 +410,18 @@ 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)
 dnl
-dnl handle --enable-dynamic-e2fsck
-dnl
-AC_ARG_ENABLE([dynamic-e2fsck],
-[  --enable-dynamic-e2fsck build e2fsck dynamically],
-if test "$enableval" = "no"
-then
-	E2FSCK_TYPE=static
-	echo "Building e2fsck statically"
-else
-	E2FSCK_TYPE=shared
-	echo "Building e2fsck dynamically"
-fi
-,
-E2FSCK_TYPE=static
-echo "Building e2fsck statically by default"
-)
-AC_SUBST(E2FSCK_TYPE)
-dnl
 dnl See whether to install the `fsck' wrapper program (that calls e2fsck)
 dnl
 AC_ARG_ENABLE([fsck],
@@ -440,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)
@@ -466,44 +455,64 @@ 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)
-dnl handle --enable-blkid-devmapper
 dnl
-AC_ARG_ENABLE([blkid-devmapper],
-[  --enable-blkid-devmapper  build with device-mapper support],
+dnl
+dnl
+AC_ARG_ENABLE([tls],
+[  --disable-tls           disable use of thread local support],
 [if test "$enableval" = "no"
 then
-	echo "Disabling device-mapper support"
-	DEVMAPPER_REQ=''
-	DEVMAPPER_LIBS=''
-	STATIC_DEVMAPPER_LIBS=''
+	try_tls=""
+	AC_MSG_RESULT([Disabling thread local support])
 else
-	AC_DEFINE(HAVE_DEVMAPPER)
-	echo "Enabling device-mapper support"
-
-	DEVMAPPER_REQ='libselinux libsepol'
-	DEVMAPPER_PC_LIBS='-ldevmapper'
-	DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol -lpthread'
-	STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a -lpthread'
-
+	try_tls="yes"
+	AC_MSG_RESULT([Enabling thread local support])
 fi]
 ,
-echo "Disabling device-mapper support by default"
+if test -n "$WITH_DIET_LIBC"
+then
+	try_tls=""
+	AC_MSG_RESULT([Diet libc does not support thread local support])
+else
+	try_tls="yes"
+	AC_MSG_RESULT([Try using thread local support by default])
+fi
 )
-AC_SUBST(DEVMAPPER_REQ)
-AC_SUBST(DEVMAPPER_PC_LIBS)
-AC_SUBST(DEVMAPPER_LIBS)
-AC_SUBST(STATIC_DEVMAPPER_LIBS)
+if test "$try_tls" = "yes"
+then
+AX_TLS
+fi
+dnl
+dnl
+dnl
+AC_ARG_ENABLE([uuidd],
+[  --disable-uuidd         disable building the uuid daemon],
+[if test "$enableval" = "no"
+then
+	AC_MSG_RESULT([Not building uuidd])
+	UUIDD_CMT="#"
+else
+	AC_DEFINE(USE_UUIDD)
+	UUIDD_CMT=""
+	AC_MSG_RESULT([Building uuidd])
+fi]
+,
+AC_DEFINE(USE_UUIDD)
+UUIDD_CMT=""
+AC_MSG_RESULT([Building uuidd by default])
+)
+AC_SUBST(UUIDD_CMT)
 dnl
 dnl
 dnl
@@ -542,6 +551,20 @@ AC_PATH_PROG(LDCONFIG, ldconfig, :)
 AC_CHECK_TOOL(AR, ar, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
+if test "_$MAKEINFO" = "_"; then
+    MAKEINFO="@echo Makeinfo is missing. Info documentation will not be built.;true"
+else
+    case "$MAKEINFO" in
+      */missing.*)
+        AC_MSG_WARN([
+*** Makeinfo is missing. Info documentation will not be built.])
+        ;;
+      *)
+        ;;
+    esac
+fi
+AC_SUBST(MAKEINFO)
 AC_PROG_INSTALL
 # See if we need a separate native compiler.
 if test $cross_compiling = no; then
@@ -550,7 +573,7 @@ if test $cross_compiling = no; then
 else
   AC_CHECK_PROGS(BUILD_CC, gcc cc)
 fi
-AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h stdint.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/ioctl.h sys/mman.h sys/mkdev.h sys/prctl.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h net/if_dl.h netinet/in.h utime.h)
+AC_CHECK_HEADERS(dirent.h errno.h getopt.h malloc.h mntent.h paths.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h)
 AC_CHECK_HEADERS(sys/disk.h sys/mount.h,,,
 [[
 #if HAVE_SYS_QUEUE_H
@@ -596,14 +619,6 @@ AC_CHECK_DECL(lseek64,[AC_DEFINE(HAVE_LSEEK64_PROTOTYPE)],,
 dnl
 dnl Word sizes...
 dnl
-if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
-  # if cross-compiling, with no cached values, just assume something common. 
-  ac_cv_sizeof_short=2
-  ac_cv_sizeof_int=4
-  ac_cv_sizeof_long=4
-  ac_cv_sizeof_long_long=8
-  AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8])
-fi
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -621,6 +636,25 @@ BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
 ASM_TYPES_HEADER=./asm_types.h
 AC_SUBST_FILE(ASM_TYPES_HEADER)
 dnl
+dnl Save the configuration #defines needed for the public ext2fs.h
+dnl header file
+dnl
+echo "/* These defines are needed for the public ext2fs.h header file */" \
+     > public_config.h
+if grep HAVE_SYS_TYPES_H confdefs.h > tmp_config.$$; then
+  uniq tmp_config.$$ >> public_config.h
+else
+  echo "#undef HAVE_SYS_TYPES_H" >> public_config.h
+fi
+if grep WORDS_BIGENDIAN confdefs.h > tmp_config.$$; then
+  uniq tmp_config.$$ >> public_config.h
+else
+  echo "#undef WORDS_BIGENDIAN" >> public_config.h
+fi
+rm -f tmp_config.$$
+PUBLIC_CONFIG_HEADER=./public_config.h
+AC_SUBST_FILE(PUBLIC_CONFIG_HEADER)
+dnl
 dnl See if we have inttypes.h and if intptr_t is defined
 dnl
 AC_CHECK_HEADERS([inttypes.h])
@@ -656,7 +690,7 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
 	[#include <sys/types.h>
 	 #include <sys/socket.h>])
 dnl
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime)
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep)
 dnl
 dnl Check to see if -lsocket is required (solaris) to make something
 dnl that uses socket() to compile; this is needed for the UUID library
@@ -687,7 +721,7 @@ dnl
 dnl Check for unified diff
 dnl
 AC_MSG_CHECKING(for unified diff option)
-if diff -u $0 $0 >& /dev/null ; then
+if diff -u $0 $0 > /dev/null 2>&1 ; then
    UNI_DIFF_OPTS=-u
 else
    UNI_DIFF_OPTS=-c
@@ -727,7 +761,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
@@ -738,9 +772,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
@@ -762,6 +796,22 @@ else
 	root_libdir='${root_prefix}/lib'
 	root_sysconfdir='${root_prefix}/etc'
 fi
+if test "$bindir" != '${exec_prefix}/bin'; then
+    root_bindir=$bindir
+    AC_MSG_RESULT([Setting root_bindir to $root_bindir])
+fi
+if test "$sbindir" != '${exec_prefix}/sbin'; then
+    root_sbindir=$sbindir
+    AC_MSG_RESULT([Setting root_sbindir to $root_sbindir])
+fi
+if test "$libdir" != '${exec_prefix}/lib'; then
+    root_libdir=$libdir
+    AC_MSG_RESULT([Setting root_libdir to $root_libdir])
+fi
+if test "$sysconfdir" != '${prefix}/etc'; then
+    root_sysconfdir=$sysconfdir
+    AC_MSG_RESULT([Setting root_sysconfdir to $root_sysconfdir])
+fi
 AC_SUBST(root_prefix)
 AC_SUBST(root_bindir)
 AC_SUBST(root_sbindir)
@@ -801,7 +851,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