svn commit: samba r19852 - in branches/SAMBA_3_0/examples/VFS: .
jpeach at samba.org
jpeach at samba.org
Thu Nov 23 06:44:05 GMT 2006
Author: jpeach
Date: 2006-11-23 06:44:05 +0000 (Thu, 23 Nov 2006)
New Revision: 19852
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19852
Log:
Fix the build for the VFS examples. Fixes bugzilla #3931.
Modified:
branches/SAMBA_3_0/examples/VFS/Makefile.in
branches/SAMBA_3_0/examples/VFS/configure.in
Changeset:
Modified: branches/SAMBA_3_0/examples/VFS/Makefile.in
===================================================================
--- branches/SAMBA_3_0/examples/VFS/Makefile.in 2006-11-23 06:07:03 UTC (rev 19851)
+++ branches/SAMBA_3_0/examples/VFS/Makefile.in 2006-11-23 06:44:05 UTC (rev 19852)
@@ -7,7 +7,15 @@
SAMBA_SOURCE = @SAMBA_SOURCE@
SHLIBEXT = @SHLIBEXT@
OBJEXT = @OBJEXT@
-FLAGS = $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/popt -I$(SAMBA_SOURCE)/smbwrapper -I. $(CPPFLAGS) -I$(SAMBA_SOURCE) -fPIC
+FLAGS = $(CFLAGS) $(CPPFLAGS) -fPIC \
+ -Iinclude -I$(SAMBA_SOURCE)/include \
+ -I$(SAMBA_SOURCE)/popt \
+ -I$(SAMBA_SOURCE)/lib/replace \
+ -I$(SAMBA_SOURCE)/lib/talloc \
+ -I$(SAMBA_SOURCE)/tdb/include \
+ -I$(SAMBA_SOURCE)/smbwrapper \
+ -I$(SAMBA_SOURCE)/librpc \
+ -I$(SAMBA_SOURCE) -I.
prefix = @prefix@
Modified: branches/SAMBA_3_0/examples/VFS/configure.in
===================================================================
--- branches/SAMBA_3_0/examples/VFS/configure.in 2006-11-23 06:07:03 UTC (rev 19851)
+++ branches/SAMBA_3_0/examples/VFS/configure.in 2006-11-23 06:44:05 UTC (rev 19852)
@@ -5,14 +5,14 @@
AC_PREREQ(2.53)
AC_INIT(Makefile.in)
-#dnl Uncomment this if you want to use your own define's too
-#AC_CONFIG_HEADER(module_config.h)
+AC_CONFIG_HEADER(module_config.h)
#dnl To make sure that didn't get #define PACKAGE_* in modules_config.h
#echo "" > confdefs.h
dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
+AC_CANONICAL_HOST
#################################################
# Directory handling stuff to support both the
@@ -309,6 +309,11 @@
BLDSHARED="false"
LDSHFLAGS=""
;;
+ *darwin*)
+ BLDSHARED="true"
+ LDSHFLAGS="-bundle -flat_namespace -undefined suppress"
+ SHLIBEXT="dylib"
+ ;;
*)
;;
esac
@@ -328,7 +333,7 @@
ac_cv_shlib_works=no
# try building a trivial shared library
if test "$PICSUFFIX" = "po"; then
- $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
+ $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/../../source/tests/shlib.c &&
$CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
ac_cv_shlib_works=yes
else
More information about the samba-cvs
mailing list