summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-10-22 22:06:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:35 -0500
commit8e82a7610596fbfa82c9acf76f88199a0ae87190 (patch)
tree030e940142747e4d2fe4b6fb82ade4f1bd369bab
parent566c7481d99d8663ec4215c1e0b03b5f798eb600 (diff)
downloadsamba-8e82a7610596fbfa82c9acf76f88199a0ae87190.tar.gz
samba-8e82a7610596fbfa82c9acf76f88199a0ae87190.tar.bz2
samba-8e82a7610596fbfa82c9acf76f88199a0ae87190.zip
r19459: Do not build nss by default (it probably works only on linux)
Fix warning with standalone.sh if build exists (This used to be commit d74fac574067ff2f3918ad435df2c2352e4b2ef7)
-rw-r--r--source4/lib/ldb/Makefile.in7
-rwxr-xr-xsource4/lib/ldb/standalone.sh7
2 files changed, 10 insertions, 4 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index c90f41afd7..b46fd73791 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -57,7 +57,12 @@ EXAMPLES = examples/ldbreader examples/ldifreader
DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples
-all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages $(NSS_LIB)
+nss: nssdir $(NSS_LIB)
+
+nssdir:
+ @mkdir -p $(NSSDIR)
+
+all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages
showflags:
@echo 'ldb will be compiled with flags:'
diff --git a/source4/lib/ldb/standalone.sh b/source4/lib/ldb/standalone.sh
index 4a085688c2..1c5d5f7e4f 100755
--- a/source4/lib/ldb/standalone.sh
+++ b/source4/lib/ldb/standalone.sh
@@ -14,8 +14,9 @@ make clean
./autogen.sh
-mkdir build
-cd build
+mkdir -p build
+cd build
../configure
-make
+make dirs
+make all