Move common libraries from root to lib/.

lib/nss_wrapper/config.m4

@@ -12,7 +12,7 @@ if eval "test x$enable_nss_wrapper = xyes"; then
 	HAVE_NSS_WRAPPER=yes
 
 	# this is only used for samba3
-	NSS_WRAPPER_OBJS="../nss_wrapper/nss_wrapper.o"
+	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
 fi
 
 AC_SUBST(HAVE_NSS_WRAPPER)

lib/popt/samba.m4

@@ -1,8 +1,8 @@
-m4_include(../popt/libpopt.m4)
+m4_include(../lib/popt/libpopt.m4)
 
 if test x"$POPT_OBJ" = "x"; then
 	SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
 else
-	SMB_INCLUDE_MK(../popt/config.mk)
+	SMB_INCLUDE_MK(../lib/popt/config.mk)
 fi
 

lib/replace/libreplace.m4

@@ -5,7 +5,7 @@ echo "LIBREPLACE_LOCATION_CHECKS: START"
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace"
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
 for d in $libreplacepaths; do
 	if test -f "$d/replace.c"; then
 		libreplacedir="$d"		
@@ -34,13 +34,18 @@ echo "LIBREPLACE_BROKEN_CHECKS: START"
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-for d in "$srcdir" "$srcdir/lib/replace" "$srcdir/libreplace" "$srcdir/../libreplace" "$srcdir/../replace"; do
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
+for d in $libreplacepaths; do
 	if test -f "$d/replace.c"; then
 		libreplacedir="$d"		
 		AC_SUBST(libreplacedir)
 		break;
 	fi
 done
+if test x"$libreplacedir" = "x"; then
+	AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
+fi
+
 LIBREPLACEOBJ="replace.o"
 AC_SUBST(LIBREPLACEOBJ)
 

lib/socket_wrapper/config.m4

@@ -14,7 +14,7 @@ if eval "test x$enable_socket_wrapper = xyes"; then
 	HAVE_SOCKET_WRAPPER=yes
 
 	# this is only used for samba3
-	SOCKET_WRAPPER_OBJS="../socket_wrapper/socket_wrapper.o"
+	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
 fi
 
 AC_SUBST(DEFAULT_TEST_OPTIONS)