diff options
| -rw-r--r-- | source3/Makefile.in | 6 | ||||
| -rw-r--r-- | source3/configure.in | 20 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 |
3 files changed, 20 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c461907984..7917db769c 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -98,7 +98,7 @@ LIBSMBCLIENT_MAJOR=0 LIBSMBCLIENT_MINOR=1 -FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -I. $(CPPFLAGS) -I$(srcdir) +FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) FLAGS2 = FLAGS3 = FLAGS4 = @@ -617,8 +617,8 @@ SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(SECRETS_OBJ) \ PROTO_OBJ = $(SMBD_OBJ_MAIN) \ $(SMBD_OBJ_SRV) $(NMBD_OBJ1) $(SWAT_OBJ1) $(LIB_OBJ) $(LIBSMB_OBJ) \ - $(SMBW_OBJ1) $(SMBWRAPPER_OBJ1) $(SMBTORTURE_OBJ1) $(RPCCLIENT_OBJ1) \ - $(LIBMSRPC_OBJ) \ + $(SMBTORTURE_OBJ1) $(RPCCLIENT_OBJ1) \ + $(LIBMSRPC_OBJ) @SMBWRAP_OBJS@ \ $(RPC_PIPE_OBJ) $(RPC_PARSE_OBJ) $(KRBCLIENT_OBJ) \ $(AUTH_OBJ) $(PARAM_OBJ) $(LOCKING_OBJ) $(SECRETS_OBJ) \ $(PRINTING_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) $(NOTIFY_OBJ) \ diff --git a/source3/configure.in b/source3/configure.in index fce7e26825..d402128393 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -225,6 +225,8 @@ AC_SUBST(KRB5_LIBS) AC_SUBST(LDAP_LIBS) AC_SUBST(SHLIB_PROGS) AC_SUBST(SMBWRAPPER) +AC_SUBST(SMBWRAP_OBJS) +AC_SUBST(SMBWRAP_INC) AC_SUBST(EXTRA_BIN_PROGS) AC_SUBST(EXTRA_SBIN_PROGS) AC_SUBST(EXTRA_ALL_TARGETS) @@ -1193,7 +1195,7 @@ SHLIBEXT="so" if test "$enable_shared" = "yes"; then # this bit needs to be modified for each OS that is suported by - # smbwrapper. You need to specify how to created a shared library and + # smbwrapper. You need to specify how to create a shared library and # how to compile C code to produce PIC object files AC_MSG_CHECKING([ability to build shared libraries]) @@ -2094,7 +2096,7 @@ fi AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[ SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper" +CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt" AC_TRY_COMPILE([ #define REPLACE_GETPASS 1 #define NO_PROTO_H 1 @@ -2410,6 +2412,8 @@ AC_ARG_WITH(smbwrapper, AC_DEFINE(WITH_SMBWRAPPER,1,[Whether to include smbwrapper support]) WRAPPROG="bin/smbsh\$(EXEEXT)" WRAP="bin/smbwrapper.$SHLIBEXT" + WRAP_OBJS="\$(SMBW_OBJ1) \$(SMBWRAPPER_OBJ1)" + WRAP_INC="-I\$(srcdir)/smbwrapper" # Conditions under which smbwrapper should not be built. @@ -2417,13 +2421,19 @@ AC_ARG_WITH(smbwrapper, echo No support for PIC code - disabling smbwrapper and smbsh WRAPPROG="" WRAP="" + WRAP_OBJS="" + WRAP_INC="" elif test x$ac_cv_func_syscall = xno; then AC_MSG_RESULT([No syscall() -- disabling smbwrapper and smbsh]) WRAPPROG="" WRAP="" + WRAP_OBJS="" + WRAP_INC="" fi EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WRAPPROG $WRAP" SMBWRAPPER="$WRAPPROG $WRAP" + SMBWRAP_OBJS="$WRAP_OBJS" + SMBWRAP_INC="$WRAP_INC" ;; *) AC_MSG_RESULT(no) @@ -3539,7 +3549,7 @@ fi if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then AC_CACHE_CHECK([whether the sys_quota interface works],samba_cv_SYSQUOTA_WORKS,[ SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper -I${srcdir-.}/nsswitch" +CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch" AC_TRY_COMPILE([ #include "confdefs.h" #define NO_PROTO_H 1 @@ -3566,7 +3576,7 @@ fi if test x"$samba_cv_SYSQUOTA_FOUND" != x"no" -a x"$samba_cv_found_xfs_header" = x"yes"; then AC_CACHE_CHECK([whether the sys_quota interface works with XFS],samba_cv_SYSQUOTA_WORKS_XFS,[ SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper -I${srcdir-.}/nsswitch" +CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch" AC_TRY_COMPILE([ #include "confdefs.h" #define NO_PROTO_H 1 @@ -3586,7 +3596,7 @@ fi AC_CACHE_CHECK([whether the old quota support works],samba_cv_QUOTA_WORKS,[ SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper -I${srcdir-.}/nsswitch" +CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch" AC_TRY_COMPILE([ #include "confdefs.h" #define NO_PROTO_H 1 diff --git a/source3/include/includes.h b/source3/include/includes.h index cf6f493dd6..a6db058708 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -864,7 +864,9 @@ extern int errno; #include "client.h" +#ifdef WITH_SMBWRAPPER #include "smbw.h" +#endif #include "session.h" |