HAVE_NSS_WRAPPER=yes
# this is only used for samba3
- NSS_WRAPPER_OBJS="../nss_wrapper/nss_wrapper.o"
+ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
fi
AC_SUBST(HAVE_NSS_WRAPPER)
-m4_include(../popt/libpopt.m4)
+m4_include(../lib/popt/libpopt.m4)
if test x"$POPT_OBJ" = "x"; then
SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
else
- SMB_INCLUDE_MK(../popt/config.mk)
+ SMB_INCLUDE_MK(../lib/popt/config.mk)
fi
dnl find the libreplace sources. This is meant to work both for
dnl libreplace standalone builds, and builds of packages using libreplace
libreplacedir=""
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace"
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
for d in $libreplacepaths; do
if test -f "$d/replace.c"; then
libreplacedir="$d"
dnl find the libreplace sources. This is meant to work both for
dnl libreplace standalone builds, and builds of packages using libreplace
libreplacedir=""
-for d in "$srcdir" "$srcdir/lib/replace" "$srcdir/libreplace" "$srcdir/../libreplace" "$srcdir/../replace"; do
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
+for d in $libreplacepaths; do
if test -f "$d/replace.c"; then
libreplacedir="$d"
AC_SUBST(libreplacedir)
break;
fi
done
+if test x"$libreplacedir" = "x"; then
+ AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
+fi
+
LIBREPLACEOBJ="replace.o"
AC_SUBST(LIBREPLACEOBJ)
HAVE_SOCKET_WRAPPER=yes
# this is only used for samba3
- SOCKET_WRAPPER_OBJS="../socket_wrapper/socket_wrapper.o"
+ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
fi
AC_SUBST(DEFAULT_TEST_OPTIONS)
dnl find the talloc sources. This is meant to work both for
dnl talloc standalone builds, and builds of packages using talloc
tallocdir=""
-tallocpaths=". lib/talloc talloc ../talloc"
+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
for d in $tallocpaths; do
if test -f "$srcdir/$d/talloc.c"; then
tallocdir="$d"
dnl find the tdb sources. This is meant to work both for
dnl tdb standalone builds, and builds of packages using tdb
tdbdir=""
-tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb"
+tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb $srcdir/../lib/tdb"
for d in $tdbpaths; do
if test -f "$d/common/tdb.c"; then
tdbdir="$d"
librpc/gen_ndr/ndr_drsuapi.o \
librpc/gen_ndr/ndr_drsblobs.o
-COMPRESSION_OBJ = ../compression/mszip.o
+COMPRESSION_OBJ = ../lib/compression/mszip.o
DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
$(COMPRESSION_OBJ)
rm -rf autom4te*.cache
rm -f configure include/config.h*
-IPATHS="-Im4 -I../replace -I../source4"
+IPATHS="-Im4 -I../lib/replace -I../source4"
echo "$0: running $AUTOHEADER $IPATHS"
$AUTOHEADER $IPATHS || exit 1
AC_LIBREPLACE_CC_CHECKS
-m4_include(../talloc/libtalloc.m4)
+m4_include(../lib/talloc/libtalloc.m4)
LIBTALLOC_OBJ0=""
for obj in ${TALLOC_OBJ}; do
# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
# but currently this fails: things have to get merged from s4.
-tdbdir="../tdb"
+tdbdir="../lib/tdb"
AC_SUBST(tdbdir)
TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
AC_SUBST(TDB_CFLAGS)
AC_SUBST(LIBTDB_OBJ0)
SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../replace"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../popt"
+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
## cleanup the $(srcdir) in the Makefile if we are outside of the tree
if test "x${srcdir-.}" != "x."; then
CFLAGS="-O"
fi
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
m4_include(m4/swat.m4)
AC_MSG_RESULT(yes)
BUILD_POPT='$(POPT_OBJ)'
POPTLIBS='$(POPT_OBJ)'
- FLAGS1="-I\$(srcdir)/../popt"
+ FLAGS1="-I\$(srcdir)/../lib/popt"
else
AC_MSG_RESULT(no)
BUILD_POPT=""
])
])
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
[],
[
- SMB_INCLUDE_MK(../talloc/config.mk)
+ SMB_INCLUDE_MK(../lib/talloc/config.mk)
]
)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
[],
[
- m4_include(../tdb/libtdb.m4)
- SMB_INCLUDE_MK(../tdb/config.mk)
+ m4_include(../lib/tdb/libtdb.m4)
+ SMB_INCLUDE_MK(../lib/tdb/config.mk)
]
)
-SMB_INCLUDE_MK(../tdb/python.mk)
+SMB_INCLUDE_MK(../lib/tdb/python.mk)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
[
libsocketsrcdir := lib/socket
libcharsetsrcdir := lib/charset
ldb_sambasrcdir := lib/ldb-samba
-tdbsrcdir := ../tdb
+tdbsrcdir := ../lib/tdb
ldbsrcdir := lib/ldb
libtlssrcdir := lib/tls
libregistrysrcdir := lib/registry
libmessagingsrcdir := lib/messaging
libeventssrcdir := lib/events
libcmdlinesrcdir := lib/cmdline
-poptsrcdir := ../popt
-socketwrappersrcdir := ../socket_wrapper
-nsswrappersrcdir := ../nss_wrapper
+poptsrcdir := ../lib/popt
+socketwrappersrcdir := ../lib/socket_wrapper
+nsswrappersrcdir := ../lib/nss_wrapper
appwebsrcdir := lib/appweb
libstreamsrcdir := lib/stream
libutilsrcdir := lib/util
libcryptosrcdir := lib/crypto
libtorturesrcdir := lib/torture
smb_serversrcdir := smb_server
-libcompressionsrcdir := ../compression
+libcompressionsrcdir := ../lib/compression
libgencachesrcdir := lib
paramsrcdir := param
rpc_serversrcdir := rpc_server
kdcsrcdir := kdc
ntp_signdsrcdir := ntp_signd
wmisrcdir := lib/wmi
-tallocsrcdir := ../talloc
+tallocsrcdir := ../lib/talloc
include data.mk
$1=[$]ac_new_flags
])
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)
m4_include(build/m4/ax_cflags_gcc_option.m4)
m4_include(build/m4/ax_cflags_irix_option.m4)
m4_include(build/m4/public.m4)
rm -rf autom4te*.cache
rm -f configure include/config_tmp.h*
-IPATHS="-I. -I../replace"
+IPATHS="-I. -I../lib/replace"
echo "$0: running $AUTOHEADER $IPATHS"
$AUTOHEADER $IPATHS || exit 1
# Configuration rules.
m4_include(build/m4/env.m4)
-m4_include(../replace/samba.m4)
+m4_include(../lib/replace/samba.m4)
m4_include(lib/smbreadline/readline.m4)
m4_include(heimdal_build/config.m4)
m4_include(lib/util/fault.m4)
m4_include(lib/util/xattr.m4)
m4_include(lib/util/capability.m4)
m4_include(lib/util/time.m4)
-m4_include(../popt/samba.m4)
+m4_include(../lib/popt/samba.m4)
m4_include(lib/charset/config.m4)
m4_include(lib/socket/config.m4)
m4_include(lib/zlib.m4)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
[],
[
- m4_include(../talloc/libtalloc.m4)
- SMB_INCLUDE_MK(../talloc/config.mk)
+ m4_include(../lib/talloc/libtalloc.m4)
+ SMB_INCLUDE_MK(../lib/talloc/config.mk)
]
)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
[],
[
- m4_include(../tdb/libtdb.m4)
- SMB_INCLUDE_MK(../tdb/config.mk)
+ m4_include(../lib/tdb/libtdb.m4)
+ SMB_INCLUDE_MK(../lib/tdb/config.mk)
]
)
-SMB_INCLUDE_MK(../tdb/python.mk)
+SMB_INCLUDE_MK(../lib/tdb/python.mk)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
[
m4_include(smbd/process_model.m4)
m4_include(ntvfs/posix/config.m4)
m4_include(ntvfs/unixuid/config.m4)
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
m4_include(auth/config.m4)
m4_include(kdc/config.m4)
m4_include(ntvfs/sysdep/config.m4)
builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
fi
-CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
+CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../lib/replace -I\$(srcdir)/../lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
SMB_WRITE_PERLVARS(build/smb_build/config.pm)
*/
#include "includes.h"
-#include "lib/compression/lzxpress.h"
+#include "../lib/compression/lzxpress.h"
#include "librpc/ndr/libndr.h"
#include "librpc/ndr/ndr_compression.h"
#include <zlib.h>
mkinclude lib/messaging/config.mk
mkinclude lib/events/config.mk
mkinclude lib/cmdline/config.mk
-mkinclude ../socket_wrapper/config.mk
-mkinclude ../nss_wrapper/config.mk
+mkinclude ../lib/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
mkinclude lib/appweb/config.mk
mkinclude lib/stream/config.mk
mkinclude lib/util/config.mk
TORTURE_LOCAL_OBJ_FILES = \
$(torturesrcdir)/../lib/charset/tests/iconv.o \
- $(torturesrcdir)/../../talloc/testsuite.o \
- $(torturesrcdir)/../../replace/test/getifaddrs.o \
- $(torturesrcdir)/../../replace/test/os2_delete.o \
- $(torturesrcdir)/../../replace/test/strptime.o \
- $(torturesrcdir)/../../replace/test/testsuite.o \
+ $(torturesrcdir)/../../lib/talloc/testsuite.o \
+ $(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
+ $(torturesrcdir)/../../lib/replace/test/os2_delete.o \
+ $(torturesrcdir)/../../lib/replace/test/strptime.o \
+ $(torturesrcdir)/../../lib/replace/test/testsuite.o \
$(torturesrcdir)/../lib/messaging/tests/messaging.o \
$(torturesrcdir)/../lib/messaging/tests/irpc.o \
$(torturesrcdir)/../librpc/tests/binding_string.o \
$(torturesrcdir)/../lib/util/tests/idtree.o \
$(torturesrcdir)/../lib/socket/testsuite.o \
- $(torturesrcdir)/../../socket_wrapper/testsuite.o \
+ $(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
$(torturesrcdir)/../libcli/resolve/testsuite.o \
$(torturesrcdir)/../lib/util/tests/strlist.o \
$(torturesrcdir)/../lib/util/tests/str.o \
$(torturesrcdir)/../lib/util/tests/file.o \
$(torturesrcdir)/../lib/util/tests/genrand.o \
- $(torturesrcdir)/../../compression/testsuite.o \
+ $(torturesrcdir)/../../lib/compression/testsuite.o \
$(torturesrcdir)/../lib/charset/tests/charset.o \
$(torturesrcdir)/../libcli/security/tests/sddl.o \
$(torturesrcdir)/../lib/tdr/testsuite.o \