diff options
| author | Simo Sorce <idra@samba.org> | 2002-08-27 09:14:21 +0000 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2002-08-27 09:14:21 +0000 |
| commit | 7251f6b9ecf6f4c797baf4cd5390cf2bf310d179 (patch) | |
| tree | f3794e87acce600f4211b10b345fa0c047a541eb /source3 | |
| parent | 8f6c926a8f9c8ff7abe67efb0784e0a1f96ac636 (diff) | |
| download | samba-7251f6b9ecf6f4c797baf4cd5390cf2bf310d179.tar.gz samba-7251f6b9ecf6f4c797baf4cd5390cf2bf310d179.tar.bz2 samba-7251f6b9ecf6f4c797baf4cd5390cf2bf310d179.zip | |
avoid using libtool for VFS modules
change a name in block.c it was hiding a function name
add a comment in configure
(This used to be commit 05038f44717ff07ed7d4a3afbdd8f072a3c058cc)
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/configure | 7 | ||||
| -rw-r--r-- | source3/configure.in | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source3/configure b/source3/configure index f95f30e393..431edcbe35 100755 --- a/source3/configure +++ b/source3/configure @@ -14018,6 +14018,9 @@ fi builddir=`pwd` +# I added make files that are outside /source directory. +# I know this is not a good solution, will work out a better +# solution soon. --simo trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -14119,7 +14122,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/VFS/netatalk/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -14254,7 +14257,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/VFS/netatalk/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/source3/configure.in b/source3/configure.in index 90b07ef20a..de8da34091 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2808,7 +2808,10 @@ AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"], builddir=`pwd` AC_SUBST(builddir) -AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile) +# I added make files that are outside /source directory. +# I know this is not a good solution, will work out a better +# solution soon. --simo +AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/VFS/netatalk/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile) ################################################# # Print very concise instructions on building/use |