summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-05 23:44:13 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-05 23:44:13 +0000
commit4af40453a806e08e009a44da05bb48875c44cebe (patch)
tree010884356b58458fff25c13e9726595c24c64a9c
parent01b838bfbbd27abd36b17aa6a8978441e8823e34 (diff)
downloadsamba-4af40453a806e08e009a44da05bb48875c44cebe.tar.gz
samba-4af40453a806e08e009a44da05bb48875c44cebe.tar.bz2
samba-4af40453a806e08e009a44da05bb48875c44cebe.zip
set HOST_OS after canonical system test
(This used to be commit fc602e5e26a2de94be6b5a5509b77876dc0fd7ff)
-rwxr-xr-xsource3/configure14
-rw-r--r--source3/configure.in2
-rw-r--r--source3/smbwrapper/smbsh.in1
3 files changed, 9 insertions, 8 deletions
diff --git a/source3/configure b/source3/configure
index c2750d5fff..a807413bb6 100755
--- a/source3/configure
+++ b/source3/configure
@@ -848,10 +848,6 @@ done
-PICFLAG="-fpic"
-HOST_OS="$host_os"
-
-
# Do some error checking and defaulting for the host and target type.
# The inputs are:
# configure --host=HOST --target=TARGET --build=BUILD NONOPT
@@ -879,7 +875,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:883: checking host system type" >&5
+echo "configure:879: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -900,7 +896,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:904: checking target system type" >&5
+echo "configure:900: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -918,7 +914,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:922: checking build system type" >&5
+echo "configure:918: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -940,6 +936,10 @@ test "$host_alias" != "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
+
+PICFLAG="-fpic"
+HOST_OS="$host_os"
+
case "$host_os" in
*linux*) cat >> confdefs.h <<\EOF
#define LINUX 1
diff --git a/source3/configure.in b/source3/configure.in
index ddacea3215..c9f3ff6150 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -13,11 +13,11 @@ AC_SUBST(WRAP32)
AC_SUBST(PICFLAG)
AC_PROG_AWK
+AC_CANONICAL_SYSTEM
PICFLAG="-fpic"
HOST_OS="$host_os"
-AC_CANONICAL_SYSTEM
case "$host_os" in
*linux*) AC_DEFINE(LINUX)
LDSHFLAGS="-shared";;
diff --git a/source3/smbwrapper/smbsh.in b/source3/smbwrapper/smbsh.in
index 7a26933f39..19e73dca80 100644
--- a/source3/smbwrapper/smbsh.in
+++ b/source3/smbwrapper/smbsh.in
@@ -45,5 +45,6 @@ case "$host_os" in
;;
esac
+echo starting smbwrapper on $host_os
exec ${SMBW_SHELL-${SHELL-/bin/sh}} ${1+"$@"}