diff options
| author | Tim Potter <tpot@samba.org> | 2002-12-05 23:02:17 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-12-05 23:02:17 +0000 |
| commit | 902caf48ef0730a17bbb858c3ff9c68b823e5907 (patch) | |
| tree | 1f1e8aef2b8b8a894c6182851cad45a6e42ab40e | |
| parent | 8ae8dd66e1509147462e80c3b50f0d04cfd18cfb (diff) | |
| download | samba-902caf48ef0730a17bbb858c3ff9c68b823e5907.tar.gz samba-902caf48ef0730a17bbb858c3ff9c68b823e5907.tar.bz2 samba-902caf48ef0730a17bbb858c3ff9c68b823e5907.zip | |
Merge from HEAD, Revision 1.379:
>Defaulting python breaks the clean target it python isn't installed.
Merge from HEAD, Revision 1.378:
>Fixes for EXEEXT - must use \$ signs when you want an actual $ sign to
>be used.
(This used to be commit 008c572ab7c77248823287133dbafa8b825e17af)
| -rw-r--r-- | source3/configure.in | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/configure.in b/source3/configure.in index 3cb5835fc3..5b1529132f 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -739,7 +739,7 @@ fi # Check if we have execl, if not we need to compile smbrun. AC_CHECK_FUNCS(execl) if test x"$ac_cv_func_execl" = x"no"; then - EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun$(EXEEXT)" + EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)" fi AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strerror chown fchown chmod fchmod chroot link mknod mknod64) @@ -1902,7 +1902,7 @@ AC_ARG_WITH(smbwrapper, yes) AC_MSG_RESULT(yes) AC_DEFINE(WITH_SMBWRAPPER,1,[Whether to include smbwrapper support]) - WRAPPROG="bin/smbsh$(EXEEXT)" + WRAPPROG="bin/smbsh\$(EXEEXT)" WRAP="bin/smbwrapper.$SHLIBEXT" if test x$ATTEMPT_WRAP32_BUILD = x; then @@ -3054,8 +3054,8 @@ if test x"$HAVE_WINBIND" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(WITH_WINBIND,1,[Whether to build winbind]) - EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo$(EXEEXT)" - EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd$(EXEEXT)" + EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)" + EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)" if test x"$BLDSHARED" = x"true"; then SHLIB_PROGS="$SHLIB_PROGS nsswitch/libnss_winbind.so" if test x"$with_pam" = x"yes"; then @@ -3133,18 +3133,15 @@ AC_SUBST(FLAGS1) # though they can coexist in different directories.) In the future # this might make the Python stuff be built by default. -# If you don't specify --with-python, we assume "python" anyhow, -# because the extensions are not built until you specifically "make -# python_ext". --without-python turns them off. Perhaps in the -# future --with-python should make them automatically built by make -# all. +# Defaulting python breaks the clean target if python isn't installed -PYTHON=python +PYTHON= AC_ARG_WITH(python, [ --with-python=PYTHONNAME build Python libraries], [ case "${withval-python}" in yes) + PYTHON=python EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS python_ext" ;; no) |