Use a single copy of popt in samba3 and samba4.

[metze/samba/wip.git] / popt / samba.m4

diff --git a/source4/lib/popt/samba.m4 b/popt/samba.m4
similarity index 54%
rename from source4/lib/popt/samba.m4
rename to popt/samba.m4
index 855fd6c402690d2ff03d21f9ca51a666af537896..9ee77dfa13a0106d0ab0a4b59f2185535a6a6030 100644 (file)
--- a/source4/lib/popt/samba.m4
+++ b/popt/samba.m4
@@ -1,8 +1,8 @@
-m4_include(lib/popt/libpopt.m4)
+m4_include(../popt/libpopt.m4)
 
 if test x"$POPT_OBJ" = "x"; then
        SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
 else
-       SMB_INCLUDE_MK(lib/popt/config.mk)
+       SMB_INCLUDE_MK(../popt/config.mk)
 fi