[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2444-gd1db2b7
Michael Adam
obnox at samba.org
Tue Feb 19 16:41:53 GMT 2008
The branch, v3-2-test has been updated
via d1db2b78c9dacddc0e24304624a6a0d0a817f774 (commit)
via 1f3bfa024d61ccb87655db2c616b28adb50d6783 (commit)
via bf1bb2c0906dd5e518c3f35ef97d69eba0e2efdf (commit)
via ad45d056df64aeed2e2c97ab69f82013791616ab (commit)
via e9b06ac113e375de11bb847c6f625f7861502853 (commit)
via 05e3095e21330c162624338160ab48d197cf0507 (commit)
via fb74f8dd6a612db0d79b091dd9972bb3204818fb (commit)
via b33db84c222af21cc3dd8233d6ff96e6f32ea3cd (commit)
via 28c862704c27aaffc858650d0a4f4cc7893bb406 (commit)
via 3ba8fa1c4b9ac46133b17112ef3494a4c23dc314 (commit)
via 35327e8fee778cb46e181add7d1987c843384989 (commit)
via aeb3673b3686f463e6c7811d61c01d8d6aec0eb3 (commit)
from e2ca12c2345c0e3916dd09d097b2ba1ce2989fa8 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d1db2b78c9dacddc0e24304624a6a0d0a817f774
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 17:01:49 2008 +0100
configure: Move path (and debug) checks to an m4 include file check_path.m4.
This is inspired by metze's check_path.m4 of Samba4.
Michael
commit 1f3bfa024d61ccb87655db2c616b28adb50d6783
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:48:49 2008 +0100
build: change selftest_prefix from ./ to ./st .
It was used as ${selftest_prefix}/st anyways...
Michael
commit bf1bb2c0906dd5e518c3f35ef97d69eba0e2efdf
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:45:38 2008 +0100
configure: move debug check to developer check
...thereby grouping test checks and debug/developer checks together, respectively.
Michael
commit ad45d056df64aeed2e2c97ab69f82013791616ab
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:44:12 2008 +0100
configure: Also set debug=yes for --enable-developer and --enable-krb5developer.
Michael
commit e9b06ac113e375de11bb847c6f625f7861502853
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:43:39 2008 +0100
configure: add default for developer and krb5developer
Michael
commit 05e3095e21330c162624338160ab48d197cf0507
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:40:50 2008 +0100
configure: move more developer/test related checks up before the compiler checks.
Michael
commit fb74f8dd6a612db0d79b091dd9972bb3204818fb
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:35:55 2008 +0100
Move the --enable-debug check up above all compiler checks.
Michael
commit b33db84c222af21cc3dd8233d6ff96e6f32ea3cd
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:34:43 2008 +0100
configure: Introduce "debug" variable set to yes by --enable-debug.
Michael
commit 28c862704c27aaffc858650d0a4f4cc7893bb406
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:24:24 2008 +0100
configure: move AC_SUBST's of certain directories to the corresponding checks.
Michael
commit 3ba8fa1c4b9ac46133b17112ef3494a4c23dc314
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 16:18:32 2008 +0100
Move AC_ENABLE_SHARED and AC_DISABLE_STATIC to a more appropriate place.
I have to investigate the effect of these and evaluate the need of
their presence. For now establish more reasonable grouping.
Michael
commit 35327e8fee778cb46e181add7d1987c843384989
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 15:58:02 2008 +0100
configure.in: move definition of build dir up.
Michael
commit aeb3673b3686f463e6c7811d61c01d8d6aec0eb3
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 15:47:30 2008 +0100
Remove unused m4 macro files.
These files were added in aa14900f8291a017aa7fab2bbb9a6c79b12889b2
(automatic dependency tracking) in SAMBA_3_2, which was removed
from configure.in in the git glue commit 5c6c8e1fe93f340005110a7833946191659d88ab.
But apparently, the files were not removed by accident.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 6 +-
source/configure.in | 319 ++-----------------------------------------
source/m4/check_gnu_make.m4 | 78 -----------
source/m4/check_path.m4 | 316 ++++++++++++++++++++++++++++++++++++++++++
source/m4/cond.m4 | 34 -----
source/m4/depend.m4 | 158 ---------------------
source/m4/depout.m4 | 68 ---------
source/m4/lead-dot.m4 | 21 ---
source/m4/make.m4 | 51 -------
source/m4/substnot.m4 | 12 --
10 files changed, 331 insertions(+), 732 deletions(-)
delete mode 100644 source/m4/check_gnu_make.m4
create mode 100644 source/m4/check_path.m4
delete mode 100644 source/m4/cond.m4
delete mode 100644 source/m4/depend.m4
delete mode 100644 source/m4/depout.m4
delete mode 100644 source/m4/lead-dot.m4
delete mode 100644 source/m4/make.m4
delete mode 100644 source/m4/substnot.m4
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 42cc12a..4402a6c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -2314,7 +2314,7 @@ test_pam_modules: pam_modules
##
test: all torture timelimit
@echo Running Test suite
- @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"
+ @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
valgrindtest: all torture timelimit
@echo Running Test suite with valgrind
@@ -2322,5 +2322,5 @@ valgrindtest: all torture timelimit
NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
WINBINDD_VALGRIND="xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
- VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \
- PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"
+ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
+ PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
diff --git a/source/configure.in b/source/configure.in
index f1bd2d2..6ff1df2 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -15,6 +15,9 @@ case "$PATH" in
;;
esac
+builddir=`pwd`
+AC_SUBST(builddir)
+
SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
@@ -34,241 +37,7 @@ if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then
echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
fi
-AC_LIBREPLACE_LOCATION_CHECKS
-
-AC_DISABLE_STATIC
-AC_ENABLE_SHARED
-
-#################################################
-# Directory handling stuff to support both the
-# legacy SAMBA directories and FHS compliant
-# ones...
-AC_PREFIX_DEFAULT(/usr/local/samba)
-
-rootsbindir="\${SBINDIR}"
-lockdir="\${VARDIR}/locks"
-piddir="\${VARDIR}/locks"
-test "${mandir}" || mandir="\${prefix}/man"
-logfilebase="\${VARDIR}"
-privatedir="\${prefix}/private"
-test "${libdir}" || libdir="\${prefix}/lib"
-pammodulesdir="\${LIBDIR}/security"
-configdir="\${LIBDIR}"
-swatdir="\${prefix}/swat"
-codepagedir="\${LIBDIR}"
-statedir="\${LOCKDIR}"
-cachedir="\${LOCKDIR}"
-
-AC_ARG_WITH(fhs,
-[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
-[ case "$withval" in
- yes)
- lockdir="\${VARDIR}/lib/samba"
- piddir="\${VARDIR}/run"
- mandir="\${prefix}/share/man"
- logfilebase="\${VARDIR}/log/samba"
- privatedir="\${CONFIGDIR}/private"
- test "${libdir}" || libdir="\${prefix}/lib/samba"
- configdir="\${sysconfdir}/samba"
- swatdir="\${DATADIR}/samba/swat"
- codepagedir="\${LIBDIR}"
- statedir="\${VARDIR}/lib/samba"
- cachedir="\${VARDIR}/lib/samba"
- AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
- ;;
- esac])
-
-#################################################
-# set private directory location
-AC_ARG_WITH(privatedir,
-[AS_HELP_STRING([--with-privatedir=DIR], [Where to put smbpasswd ($ac_default_prefix/private)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-privatedir called without argument - will use default])
- ;;
- * )
- privatedir="$withval"
- ;;
- esac])
-
-#################################################
-# set root sbin directory location
-AC_ARG_WITH(rootsbindir,
-[AS_HELP_STRING([--with-rootsbindir=DIR], [Which directory to use for root sbin ($ac_default_prefix/sbin)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-rootsbindir called without argument - will use default])
- ;;
- * )
- rootsbindir="$withval"
- ;;
- esac])
-
-#################################################
-# set lock directory location
-AC_ARG_WITH(lockdir,
-[AS_HELP_STRING([--with-lockdir=DIR], [Where to put lock files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-lockdir called without argument - will use default])
- ;;
- * )
- lockdir="$withval"
- ;;
- esac])
-
-#################################################
-# set pid directory location
-AC_ARG_WITH(piddir,
-[AS_HELP_STRING([--with-piddir=DIR], [Where to put pid files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-piddir called without argument - will use default])
- ;;
- * )
- piddir="$withval"
- ;;
- esac])
-
-#################################################
-# set SWAT directory location
-AC_ARG_WITH(swatdir,
-[AS_HELP_STRING([--with-swatdir=DIR], [Where to put SWAT files ($ac_default_prefix/swat)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-swatdir called without argument - will use default])
- ;;
- * )
- swatdir="$withval"
- ;;
- esac])
-
-#################################################
-# set configuration directory location
-AC_ARG_WITH(configdir,
-[AS_HELP_STRING([--with-configdir=DIR], [Where to put configuration files ($libdir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-configdir called without argument - will use default])
- ;;
- * )
- configdir="$withval"
- ;;
- esac])
-
-#################################################
-# set log directory location
-AC_ARG_WITH(logfilebase,
-[AS_HELP_STRING([--with-logfilebase=DIR], [Where to put log files ($VARDIR)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-logfilebase called without argument - will use default])
- ;;
- * )
- logfilebase="$withval"
- ;;
- esac])
-
-
-#################################################
-# set ctdb source directory location
-AC_ARG_WITH(ctdb,
-[AS_HELP_STRING([--with-ctdb=DIR], [Where to find ctdb sources])],
-[ case "$withval" in
- yes|no)
- AC_MSG_WARN([--with-ctdb called without argument])
- ;;
- * )
- ctdbdir="$withval"
- ;;
- esac])
-
-#################################################
-# set lib directory location
-AC_ARG_WITH(libdir,
-[AS_HELP_STRING([--with-libdir=DIR], [Where to put libdir ($libdir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-libdir without argument - will use default])
- ;;
- * )
- libdir="$withval"
- ;;
- esac])
-
-#################################################
-# set PAM modules directory location
-AC_ARG_WITH(pammodulesdir,
-[AS_HELP_STRING([--with-pammodulesdir=DIR], [Which directory to use for PAM modules ($ac_default_prefix/$libdir/security)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-pammodulesdir called without argument - will use default])
- ;;
- * )
- pammodulesdir="$withval"
- ;;
- esac])
-
-#################################################
-# set man directory location
-AC_ARG_WITH(mandir,
-[AS_HELP_STRING([--with-mandir=DIR], [Where to put man pages ($mandir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-mandir without argument - will use default])
- ;;
- * )
- mandir="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(cfenc,
-[AS_HELP_STRING([--with-cfenc=HEADERDIR], [Use internal CoreFoundation encoding API for optimization (Mac OS X/Darwin only)])],
-[
-# May be in source $withval/CoreFoundation/StringEncodings.subproj.
-# Should have been in framework $withval/CoreFoundation.framework/Headers.
-for d in \
- $withval/CoreFoundation/StringEncodings.subproj \
- $withval/StringEncodings.subproj \
- $withval/CoreFoundation.framework/Headers \
- $withval/Headers \
- $withval
-do
- if test -r $d/CFStringEncodingConverter.h; then
- ln -sfh $d include/CoreFoundation
- fi
-done
-])
+m4_include(m4/check_path.m4)
AC_LIBREPLACE_CC_CHECKS
@@ -310,21 +79,6 @@ if test "x${srcdir-.}" != "x."; then
SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
fi
-AC_SUBST(configdir)
-AC_SUBST(lockdir)
-AC_SUBST(piddir)
-AC_SUBST(logfilebase)
-AC_SUBST(ctdbdir)
-AC_SUBST(privatedir)
-AC_SUBST(swatdir)
-AC_SUBST(bindir)
-AC_SUBST(sbindir)
-AC_SUBST(codepagedir)
-AC_SUBST(statedir)
-AC_SUBST(cachedir)
-AC_SUBST(rootsbindir)
-AC_SUBST(pammodulesdir)
-
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SAMBA_CPPFLAGS)
AC_SUBST(SHELL)
@@ -408,14 +162,6 @@ AC_SUBST(EXTRA_ALL_TARGETS)
AC_SUBST(CONFIG_LIBS)
AC_SUBST(NSCD_LIBS)
-## check for --enable-debug first before checking CFLAGS before
-## so that we don't mix -O and -g
-AC_ARG_ENABLE(debug,
-[AS_HELP_STRING([--enable-debug], [Turn on compiler debugging information (default=no)])],
- [if eval "test x$enable_debug = xyes"; then
- CFLAGS="${CFLAGS} -g"
- fi])
-
# compile with optimization and without debugging by default, but
# allow people to set their own preference.
# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
@@ -424,6 +170,11 @@ AC_ARG_ENABLE(debug,
if test "x$CFLAGS" = x; then
CFLAGS="-O"
fi
+if test "x$debug" = "xyes" ; then
+ CFLAGS="${CFLAGS} -g"
+else
+ CFLAGS="-O"
+fi
CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
@@ -447,52 +198,6 @@ AC_ARG_ENABLE(swat,
AC_SUBST(SWAT_SBIN_TARGETS)
AC_SUBST(SWAT_INSTALL_TARGETS)
-#################################################
-# set prefix for 'make test'
-selftest_prefix="./"
-AC_SUBST(selftest_prefix)
-AC_ARG_WITH(selftest-prefix,
-[AS_HELP_STRING([--with-selftest-prefix=DIR], [The prefix where make test will be run ($selftest_prefix)])],
-[ case "$withval" in
- yes|no)
- AC_MSG_WARN([--with-selftest-prefix called without argument - will use default])
- ;;
- * )
- selftest_prefix="$withval"
- ;;
- esac
-])
-
-#################################################
-# set path of samba4's smbtorture
-smbtorture4_path=""
-AC_SUBST(smbtorture4_path)
-AC_ARG_WITH(smbtorture4_path,
-[AS_HELP_STRING([--with-smbtorture4-path=PATH], [The path to a samba4 smbtorture for make test (none)])],
-[ case "$withval" in
- yes|no)
- AC_MSG_ERROR([--with-smbtorture4-path should take a path])
- ;;
- * )
- smbtorture4_path="$withval"
- if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then
- AC_MSG_ERROR(['$smbtorture_path' does not exist!])
- fi
- ;;
- esac
-])
-
-AC_ARG_ENABLE(developer, [AS_HELP_STRING([--enable-developer], [Turn on developer warnings and debugging (default=no)])],
- [if eval "test x$enable_developer = xyes"; then
- developer=yes
- fi])
-
-AC_ARG_ENABLE(krb5developer, [AS_HELP_STRING([--enable-krb5developer], [Turn on developer warnings and debugging, except -Wstrict-prototypes (default=no)])],
- [if eval "test x$enable_krb5developer = xyes"; then
- developer=yes
- krb5_developer=yes
- fi])
-
# Probe the gcc version for extra CFLAGS. We always stash these in
# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
# Makefile edit, avoiding the need to re-run configure.
@@ -1782,6 +1487,9 @@ case "$host_os" in
;;
esac
+AC_DISABLE_STATIC
+AC_ENABLE_SHARED
+
# Set defaults
PIE_CFLAGS=""
PIE_LDFLAGS=""
@@ -6826,9 +6534,6 @@ if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes"; then
CFLAGS="${CFLAGS} \$(DEVELOPER_CFLAGS)"
fi
-builddir=`pwd`
-AC_SUBST(builddir)
-
# Stuff the smbd-only libraries at the end of the smbd link
# path (if we have them).
SMBD_LIBS="$samba_dmapi_libs"
diff --git a/source/m4/check_gnu_make.m4 b/source/m4/check_gnu_make.m4
deleted file mode 100644
index 44e1d9a..0000000
--- a/source/m4/check_gnu_make.m4
+++ /dev/null
@@ -1,78 +0,0 @@
-##### http://autoconf-archive.cryp.to/check_gnu_make.html
-#
-# SYNOPSIS
-#
-# CHECK_GNU_MAKE()
-#
-# DESCRIPTION
-#
-# This macro searches for a GNU version of make. If a match is found,
-# the makefile variable `ifGNUmake' is set to the empty string,
-# otherwise it is set to "#". This is useful for including a special
-# features in a Makefile, which cannot be handled by other versions
-# of make. The variable _cv_gnu_make_command is set to the command to
-# invoke GNU make if it exists, the empty string otherwise.
-#
-# Here is an example of its use:
-#
-# Makefile.in might contain:
-#
-# # A failsafe way of putting a dependency rule into a makefile
-# $(DEPEND):
-# $(CC) -MM $(srcdir)/*.c > $(DEPEND)
-#
-# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
-# @ifGNUmake@ include $(DEPEND)
-# @ifGNUmake@ endif
-#
-# Then configure.in would normally contain:
-#
-# CHECK_GNU_MAKE()
-# AC_OUTPUT(Makefile)
-#
-# Then perhaps to cause gnu make to override any other make, we could
-# do something like this (note that GNU make always looks for
-# GNUmakefile first):
-#
-# if ! test x$_cv_gnu_make_command = x ; then
-# mv Makefile GNUmakefile
-# echo .DEFAULT: > Makefile ;
-# echo \ $_cv_gnu_make_command \$@ >> Makefile;
-# fi
-#
-# Then, if any (well almost any) other make is called, and GNU make
-# also exists, then the other make wraps the GNU make.
-#
-# LAST MODIFICATION
-#
-# 2002-01-04
-#
-# COPYLEFT
-#
-# Copyright (c) 2002 John Darrington <j.darrington at elvis.murdoch.edu.au>
-#
-# Copying and distribution of this file, with or without
-# modification, are permitted in any medium without royalty provided
-# the copyright notice and this notice are preserved.
-
-AC_DEFUN(
- [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
- _cv_gnu_make_command='' ;
-dnl Search all the common names for GNU make
- for a in "$MAKE" make gmake gnumake ; do
- if test -z "$a" ; then continue ; fi ;
- if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
- _cv_gnu_make_command=$a ;
- break;
- fi
- done ;
- ) ;
-dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
- if test "x$_cv_gnu_make_command" != "x" ; then
- ifGNUmake='' ;
- else
- ifGNUmake='#' ;
- AC_MSG_RESULT("Not found");
- fi
- AC_SUBST(ifGNUmake)
-] )
diff --git a/source/m4/check_path.m4 b/source/m4/check_path.m4
new file mode 100644
index 0000000..ccf2127
--- /dev/null
+++ b/source/m4/check_path.m4
@@ -0,0 +1,316 @@
+dnl
+dnl Samba3 build environment path checks
+dnl
+dnl Copyright (C) Michael Adam 2008
+dnl
+dnl Released under the GNU General Public License
+dnl http://www.gnu.org/licenses/
+dnl
+
+AC_LIBREPLACE_LOCATION_CHECKS
--
Samba Shared Repository
More information about the samba-cvs
mailing list