diff options
| author | Gerald Carter <jerry@samba.org> | 2002-05-09 13:52:06 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-05-09 13:52:06 +0000 |
| commit | 3de73897e7083520ac123b399cd823ce61a4d475 (patch) | |
| tree | 11948289003ca82cc9f1dd328672ef4c7e95635e | |
| parent | 0e6247187b14ba271aad47b7b6b2b7737dd66947 (diff) | |
| download | samba-3de73897e7083520ac123b399cd823ce61a4d475.tar.gz samba-3de73897e7083520ac123b399cd823ce61a4d475.tar.bz2 samba-3de73897e7083520ac123b399cd823ce61a4d475.zip | |
merge from SAMBA_2_2
(This used to be commit 7382c3013d7b630ba7229a1d12104b8f7edfd9ca)
| -rwxr-xr-x | source3/configure | 8 | ||||
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rwxr-xr-x | source3/script/findsmb.in (renamed from source3/script/findsmb) | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/configure b/source3/configure index c72a638b90..1671ffc7ef 100755 --- a/source3/configure +++ b/source3/configure @@ -8907,7 +8907,7 @@ EOF BLDSHARED="true" LDSHFLAGS="-h \$@ -G" - if test "${ac_cv_prog_CC}" = "gcc"; then + if test "${GCC}" = "yes"; then PICFLAG="-fPIC" else PICFLAG="-KPIC" @@ -8950,7 +8950,7 @@ EOF BLDSHARED="true" LDSHFLAGS="-soname \$@ -shared" SHLD="\${LD}" - if test "${ac_cv_prog_CC}" = "gcc"; then + if test "${GCC}" = "yes"; then PICFLAG="-fPIC" else PICFLAG="-KPIC" @@ -14051,7 +14051,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "include/stamp-h Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "include/stamp-h Makefile script/findsmb include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -14182,7 +14182,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile script/findsmb"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/source3/configure.in b/source3/configure.in index 03a21aa60b..c224f9a7b7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -883,7 +883,7 @@ case "$host_os" in AC_DEFINE(SUNOS5) BLDSHARED="true" LDSHFLAGS="-h \$@ -G" - if test "${ac_cv_prog_CC}" = "gcc"; then + if test "${GCC}" = "yes"; then PICFLAG="-fPIC" else PICFLAG="-KPIC" @@ -911,7 +911,7 @@ case "$host_os" in BLDSHARED="true" LDSHFLAGS="-soname \$@ -shared" SHLD="\${LD}" - if test "${ac_cv_prog_CC}" = "gcc"; then + if test "${GCC}" = "yes"; then PICFLAG="-fPIC" else PICFLAG="-KPIC" @@ -2864,7 +2864,7 @@ AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"], builddir=`pwd` AC_SUBST(builddir) -AC_OUTPUT(include/stamp-h Makefile) +AC_OUTPUT(include/stamp-h Makefile script/findsmb) ################################################# # Print very concise instructions on building/use diff --git a/source3/script/findsmb b/source3/script/findsmb.in index 04bc608050..d2aa94591b 100755 --- a/source3/script/findsmb +++ b/source3/script/findsmb.in @@ -15,7 +15,7 @@ # that workgroup. # -$SAMBABIN = "/usr/bin"; +$SAMBABIN = "@prefix@/bin"; for ($i = 0; $i < 2; $i++) { # test for -d option and broadcast address $_ = shift; |