summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-17 18:57:40 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-17 18:57:40 +0200
commit661d25402ecb36a35bee6b282440854f5280781a (patch)
tree290854e931ee778bea5badaefa07e88704aef6dc
parentb16a8f31ad7b6434b44e24e96b72d877a7ede356 (diff)
downloadsamba-661d25402ecb36a35bee6b282440854f5280781a.tar.gz
samba-661d25402ecb36a35bee6b282440854f5280781a.tar.bz2
samba-661d25402ecb36a35bee6b282440854f5280781a.zip
Fix pidl/config.m4 location.
-rw-r--r--source3/Makefile.in8
-rw-r--r--source3/samba4.mk2
-rw-r--r--source4/configure.ac2
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 29f76a1940..5ba370c0e1 100644
--- 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 b145f4ca4b..294eef8b8f 100644
--- 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 099da400e7..a445dc62a6 100644
--- 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)