The branch, v3-2-test has been updated via 39eef8e86cfab60c1328d2335a737b41d8fd6db0 (commit) via 63bff18f3f6396736910a8e1f5f2abf453c4f89a (commit) via 8b220717e8dd62455716d4aaf6728087d04fb71b (commit) via 2e6b66eda4dc30f03f1309a1dbef3eb87a4f7d1e (commit) from 8883ee2418152d58e2ce609e02105e009f8ca4e8 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 39eef8e86cfab60c1328d2335a737b41d8fd6db0 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Feb 20 23:44:17 2008 +0100 Fix build with static libs: place tdb static lib after tdb-util objects. Michael commit 63bff18f3f6396736910a8e1f5f2abf453c4f89a Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Feb 20 22:47:31 2008 +0100 configure: add --enable-shared-libs to control overall internal use of shared libs. To disable internal use of shared libraries altogether (as opposed to disabling use of single shared libs by --with-static-libs=LIBS), use this new configure parameter --disable-shared-libs. Michael commit 8b220717e8dd62455716d4aaf6728087d04fb71b Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Feb 20 21:33:06 2008 +0100 configure: Move assemblage of samba version strings to m4 include file. Michael commit 2e6b66eda4dc30f03f1309a1dbef3eb87a4f7d1e Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Feb 20 17:56:21 2008 +0100 Remove checks for ino_t, loff_t, offset_t, and comparison_fn_t from configure.in. These tests are in libreplace. Michael ----------------------------------------------------------------------- Summary of changes: source/Makefile.in | 5 ++- source/configure.in | 60 ++++++++++++++++++++++++------------------- source/m4/samba_version.m4 | 29 +++++++++++++++++++++ 3 files changed, 65 insertions(+), 29 deletions(-) create mode 100644 source/m4/samba_version.m4 Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 4402a6c..5c0b73a 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -241,8 +241,9 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \ LIBTDB_OBJ0 = @TDB_OBJS@ LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) -TDB_OBJ = @LIBTDB_STATIC@ lib/util_tdb.o \ - lib/dbwrap.o lib/dbwrap_tdb.o lib/dbwrap_ctdb.o lib/dbwrap_rbt.o +TDB_OBJ = lib/util_tdb.o \ + lib/dbwrap.o lib/dbwrap_tdb.o lib/dbwrap_ctdb.o lib/dbwrap_rbt.o \ + @LIBTDB_STATIC@ SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@ diff --git a/source/configure.in b/source/configure.in index e218c0b..fe9d716 100644 --- a/source/configure.in +++ b/source/configure.in @@ -18,25 +18,7 @@ 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}" - -SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2` -if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then - echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}" -fi -SAMBA_VERSION_GIT_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-` -if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then - echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}" -fi -SAMBA_VERSION_GIT_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-` -if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then - echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}" - - # just to keep the build-farm gui happy for now... - echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}" -fi - +m4_include(m4/samba_version.m4) m4_include(m4/check_path.m4) AC_LIBREPLACE_CC_CHECKS @@ -792,13 +774,8 @@ AC_TYPE_SIZE_T AC_TYPE_PID_T AC_STRUCT_ST_RDEV AC_DIRENT_D_OFF -AC_CHECK_TYPE(ino_t,unsigned) -AC_CHECK_TYPE(loff_t,off_t) -AC_CHECK_TYPE(offset_t,loff_t) AC_CHECK_TYPE(ssize_t, int) AC_CHECK_TYPE(wchar_t, unsigned short) -AC_CHECK_TYPE(comparison_fn_t, -[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])]) ############################################ # for cups support we need libcups, and a handful of header files @@ -4723,6 +4700,31 @@ if test $enable_static = yes; then fi ################################################# +# --disable-shared-libs +# can be used to disable the internal use of shared libs altogether +# (this only has an effect when building shared libs is enabled) +# +USESHARED=false +AC_SUBST(USESHARED) + +AC_MSG_CHECKING(whether to use shared libraries internally) +AC_ARG_ENABLE([shared-libs], + AS_HELP_STRING([--enable-shared-libs], + [Use shared libraries internally (default=yes)]), + [enable_shared_libs=$enableval], + [enable_shared_libs=yes]) + +if test x"$enable_shared_libs" != x"no" ; then + USESHARED=$BLDSHARED +fi + +AC_MSG_RESULT([$USESHARED]) + +if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then + AC_MSG_WARN([--enable-shared-libs: no support for shared libraries]) +fi + +################################################# # --with-static-libs=LIBS: # link (internal) libs dynamically or statically? # @@ -4785,10 +4787,12 @@ samba_cv_with_libtalloc=yes if test x"$samba_cv_with_libtalloc" = "xyes" -a $BLDSHARED = true; then LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET AC_MSG_RESULT(yes) - if test x"$LINK_LIBTALLOC" = "xSTATIC" ; then + if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET + AC_MSG_NOTICE([not using libtalloc shared library internally]) else LIBTALLOC_LIBS=-ltalloc + AC_MSG_NOTICE([using libtalloc shared library internally]) fi else enable_static=yes @@ -4829,8 +4833,9 @@ samba_cv_with_libtdb=yes if test x"$samba_cv_with_libtdb" = "xyes" -a $BLDSHARED = true; then LIBTDB_SHARED=$LIBTDB_SHARED_TARGET AC_MSG_RESULT(yes) - if test x"$LINK_LIBTDB" = "xSTATIC" ; then + if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then LIBTDB_STATIC=$LIBTDB_STATIC_TARGET + AC_MSG_NOTICE([not using libtdb shared library internally]) else LIBTDB_LIBS=-ltdb fi @@ -4872,8 +4877,9 @@ samba_cv_with_libnetapi=yes if test x"$samba_cv_with_libnetapi" = x"yes" -a $BLDSHARED = true; then LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET AC_MSG_RESULT(yes) - if test x"$LINK_LIBNETAPI" = x"STATIC" ; then + if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = x"STATIC" ; then LIBNETAPI_STATIC=$LIBNETAPI_STATIC_TARGET + AC_MSG_NOTICE([not using libnetapi shared library internally]) else LIBNETAPI_LIBS=-lnetapi fi diff --git a/source/m4/samba_version.m4 b/source/m4/samba_version.m4 new file mode 100644 index 0000000..4d749e9 --- /dev/null +++ b/source/m4/samba_version.m4 @@ -0,0 +1,29 @@ +dnl +dnl Samba3 build environment - Samba version variables +dnl +dnl Copyright (C) Michael Adam 2008 +dnl +dnl Released under the GNU General Public License +dnl http://www.gnu.org/licenses/ +dnl +dnl + +SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2` +echo "SAMBA VERSION: ${SMB_VERSION_STRING}" + +SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2` +if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then + echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}" +fi +SAMBA_VERSION_GIT_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-` +if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then + echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}" +fi +SAMBA_VERSION_GIT_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-` +if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then + echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}" + + # just to keep the build-farm gui happy for now... + echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}" +fi + -- Samba Shared Repository