Commit a modified version of Matthieu Patou <mat@matws.net> path on disabling tdb2...

The only modification brought is the PKG_CONFIG_PATH determined depending on SAMBA_DIR path rather than hardcoded and
update of existing PKG_CONFIG_PATH rather than overwrite.

diff --git a/script/installsamba4.sh b/script/installsamba4.sh
index 8b4b2239fad604a6cfcd1b24efb9526505db30d2..0bf692b775fa7842e3a3ae9c0a761d8bb69bfdd8 100755 (executable)
--- a/script/installsamba4.sh
+++ b/script/installsamba4.sh
@@ -250,13 +250,17 @@ packages() {
 
     for lib in lib/talloc lib/tdb lib/tevent lib/ldb; do
        echo "Building and installing $lib library"
+       export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$SAMBA_PREFIX/lib/pkgconfig
        pushd samba4/$lib
        error_check $? "$lib setup"
 
-       $BUILDTOOLS/scripts/autogen-waf.sh
-       error_check $? "$lib autogen"
-       echo ./configure -C --prefix=$SAMBA_PREFIX --enable-developer --bundled-libraries=NONE
-       ./configure -C --prefix=$SAMBA_PREFIX --enable-developer --bundled-libraries=NONE
+       extra=""
+       if [ "$lib" == "lib/ldb" ]; then
+           extra="--disable-tdb2"
+       fi
+
+       echo ./configure -C --prefix=$SAMBA_PREFIX --enable-developer --bundled-libraries=NONE $extra
+       ./configure -C --prefix=$SAMBA_PREFIX --enable-developer --bundled-libraries=NONE $extra
        error_check $? "$lib configure"
 
        $MAKE -j
@@ -275,6 +279,7 @@ packages() {
        error_check $? "$lib make distclean"
 
        popd
+       export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$SAMBA_PREFIX/lib/pkgconfig
     done
 }
 
@@ -287,7 +292,8 @@ compile() {
     error_check $? "samba4 setup"
 
     cd $RUNDIR/../samba4
-    ./configure.developer -C --prefix=$SAMBA_PREFIX
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$SAMBA_PREFIX/lib/pkgconfig
+    ./configure.developer -C --prefix=$SAMBA_PREFIX --disable-tdb2
     error_check $? "samba4 configure"
 
     echo "Step2: Compile Samba4 (Source)"