Fix pidl/config.m4 location.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 29f76a1940e16420af0ce42599e9094d29bd0fdf..5ba370c0e13aad1efbdc1a7fc4a7241d942841b7 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -949,10 +949,10 @@ SHARESEC_OBJ  = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 TALLOCTORT_OBJ = @tallocdir@/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
                  $(LIBSAMBA_OBJ)
 
-REPLACETORT_OBJ = lib/replace/test/testsuite.o \
-               lib/replace/test/getifaddrs.o \
-               lib/replace/test/os2_delete.o \
-               lib/replace/test/strptime.o \
+REPLACETORT_OBJ = ../lib/replace/test/testsuite.o \
+               ../lib/replace/test/getifaddrs.o \
+               ../lib/replace/test/os2_delete.o \
+               ../lib/replace/test/strptime.o \
                $(LIBREPLACE_OBJ)
 
 NDRDUMP_OBJ = librpc/tools/ndrdump.o \

diff --git a/source3/samba4.mk b/source3/samba4.mk
index b145f4ca4b301389c77f1d55050189ceca627c0b..294eef8b8fbca0fc0c3613a8a7f415494b5a4684 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -57,7 +57,7 @@ endif
 
 INTERN_LDFLAGS = -L${builddir}/bin/static -L${builddir}/bin/shared
 
-pidldir = $(samba4srcdir)/pidl
+pidldir = $(samba4srcdir)/../pidl
 include $(pidldir)/config.mk
 include samba4-config.mk
 include samba4-templates.mk

diff --git a/source4/configure.ac b/source4/configure.ac
index 099da400e73cbfeb8bf59f2a25d0d0c80a9ed939..a445dc62a653bd9914220da919d98edd5d2d3735 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -26,7 +26,7 @@ m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(lib/zlib.m4)
 m4_include(nsswitch/nsstest.m4)
-m4_include(pidl/config.m4)
+m4_include(../pidl/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
 AC_CONFIG_FILES(lib/events/events.pc)