Adjust defaults for FreeBSD to no longer build the

	fsck wrapper, and to not install into /usr/local by
	default.  (Addresses Debian bug #195274)

diff --git a/ChangeLog b/ChangeLog
index a9c97c6074e1ef123ebfbe2392e02320c301a467..dad80acc870236d84f99aace162be0c713f91226 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-08  Theodore Ts'o  <tytso@mit.edu>
+
+       * configure.in: Adjust defaults for FreeBSD to no longer build the
+               fsck wrapper, and to not install into /usr/local by
+               default.  (Addresses Debian bug #195274)
+
 2003-05-17  Theodore Tso  <tytso@thunk.org>
 
        * MCONFIG.in, configure.in: Only put the intl directory in the -I

diff --git a/configure b/configure
index 226c963aa5da3133d640d46195316abc49485cc7..fc4f151ce2a26e0379dbad9b3171f79fbc38c6e6 100644 (file)
--- a/configure
+++ b/configure
@@ -1587,7 +1587,7 @@ fi
 
 else
   case "$host_os" in
-  gnu*)
+  gnu* | freebsd*-gnu*)
     FSCK_PROG='' FSCK_MAN=''
     echo "Not building fsck wrapper by default"
     ;;
@@ -6057,7 +6057,7 @@ esac
 
 
 case "$host_os" in
-linux* | gnu*)
+linux* | gnu* | freebsd*-gnu*)
        if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
                root_prefix="";
                echo "On $host_os systems, root_prefix defaults to ''"
@@ -6065,7 +6065,7 @@ linux* | gnu*)
        ;;
 esac
 case "$host_os" in
-linux* | gnu*)
+linux* | gnu* | freebsd*-gnu*)
        if test "$prefix" = NONE ; then
                prefix="/usr";
                echo "On $host_os systems, prefix defaults to /usr"

diff --git a/configure.in b/configure.in
index d7c2ce8bbd5e4a8c0746ca28c155a234e74869f4..526b3c163a5e92a4e134575720b6125baf498731 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -502,7 +502,7 @@ else
 fi]
 ,
 [case "$host_os" in
-  gnu*)
+  gnu* | freebsd*-gnu*)
     FSCK_PROG='' FSCK_MAN=''
     echo "Not building fsck wrapper by default"
     ;;
@@ -740,7 +740,7 @@ dnl
 dnl Linux and Hurd places root files in the / by default
 dnl
 case "$host_os" in
-linux* | gnu*)
+linux* | gnu* | freebsd*-gnu*)
        if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
                root_prefix="";
                echo "On $host_os systems, root_prefix defaults to ''"
@@ -751,7 +751,7 @@ dnl
 dnl On Linux/hurd, force the prefix to be /usr
 dnl
 case "$host_os" in
-linux* | gnu*)
+linux* | gnu* | freebsd*-gnu*)
        if test "$prefix" = NONE ; then
                prefix="/usr";
                echo "On $host_os systems, prefix defaults to /usr"