Fix standalone configure scripts

diff --git a/lib/tevent/build_macros.m4 b/lib/tevent/build_macros.m4
index c036668cd14e8b73063a19a7f8d9ff2e2bb4aa53..bb7fad8f7aadf12feb1c214080c37b46bc9fdda0 100644 (file)
--- a/lib/tevent/build_macros.m4
+++ b/lib/tevent/build_macros.m4
@@ -7,6 +7,7 @@ AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR,
     if test x"$with_shared_build_dir" != x; then
         sharedbuilddir=$with_shared_build_dir
         CFLAGS="$CFLAGS -I$with_shared_build_dir/include"
+        CPPFLAGS="$CPPFLAGS -I$with_shared_build_dir/include"
         LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
     fi
     AC_SUBST(sharedbuilddir)

diff --git a/source4/lib/ldb/build_macros.m4 b/source4/lib/ldb/build_macros.m4
index c036668cd14e8b73063a19a7f8d9ff2e2bb4aa53..bb7fad8f7aadf12feb1c214080c37b46bc9fdda0 100644 (file)
--- a/source4/lib/ldb/build_macros.m4
+++ b/source4/lib/ldb/build_macros.m4
@@ -7,6 +7,7 @@ AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR,
     if test x"$with_shared_build_dir" != x; then
         sharedbuilddir=$with_shared_build_dir
         CFLAGS="$CFLAGS -I$with_shared_build_dir/include"
+        CPPFLAGS="$CPPFLAGS -I$with_shared_build_dir/include"
         LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
     fi
     AC_SUBST(sharedbuilddir)

diff --git a/source4/lib/ldb/external/libevents.m4 b/source4/lib/ldb/external/libevents.m4
index 24534f2c2123e3e86f0ea60ebe4b68fe6705f896..6a0e36af8b21b17ae6b21b8576c0421e86aed1d8 100644 (file)
--- a/source4/lib/ldb/external/libevents.m4
+++ b/source4/lib/ldb/external/libevents.m4
@@ -3,5 +3,5 @@ AC_SUBST(TEVENT_CFLAGS)
 AC_SUBST(TEVENT_LIBS)
 
 AC_CHECK_HEADER(tevent.h,
-   [AC_CHECK_LIB(tevent, event_context_init, [TEVENT_LIBS="-ltevent"]) ],
+   [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"]) ],
    [PKG_CHECK_MODULES(TEVENT, tevent)])