r18419: fix include paths of the configure tests

metze
(This used to be commit 8774eeb0dc8a72a9871d42bf1652ce4f7d4a29b7)

diff --git a/source4/lib/replace/getpass.m4 b/source4/lib/replace/getpass.m4
index d66be30564f01dc7d861086c8f60dc04b6363f12..3f008bbf4e1a75c6c65df65f6d196d04201cee78 100644 (file)
--- a/source4/lib/replace/getpass.m4
+++ b/source4/lib/replace/getpass.m4
@@ -1,11 +1,12 @@
 AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
 SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt  -I${srcdir-.}/smbwrapper"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
 AC_TRY_COMPILE([
+#include "confdefs.h"
+#define _LIBREPLACE_REPLACE_H
 #define REPLACE_GETPASS 1
-#define NO_CONFIG_H 1
 #define main dont_declare_main
-#include "${srcdir-.}/lib/replace/getpass.c"
+#include "$libreplacedir/getpass.c"
 #undef main
 ],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no)
 CPPFLAGS="$SAVE_CPPFLAGS"

diff --git a/source4/lib/replace/repdir/config.m4 b/source4/lib/replace/repdir/config.m4
index b17c92e7d632d96fdf4b8c0d6f3ea2961295fbb4..b2a20ccee6e933aa7b516efc1a490ebf50c43a86 100644 (file)
--- a/source4/lib/replace/repdir/config.m4
+++ b/source4/lib/replace/repdir/config.m4
@@ -1,5 +1,5 @@
 AC_CACHE_CHECK([for broken readdir],samba_cv_HAVE_BROKEN_READDIR,[
-       AC_TRY_RUN([#include "${srcdir-.}/build/tests/os2_delete.c"],
+       AC_TRY_RUN([#include "$libreplacedir/test/os2_delete.c"],
                   [samba_cv_HAVE_BROKEN_READDIR=no],
                           [samba_cv_HAVE_BROKEN_READDIR=yes],
                           [samba_cv_HAVE_BROKEN_READDIR="assuming not"])])
@@ -7,8 +7,8 @@ AC_CACHE_CHECK([for broken readdir],samba_cv_HAVE_BROKEN_READDIR,[
 if test x"$samba_cv_HAVE_BROKEN_READDIR" = x"yes"; then
 AC_CACHE_CHECK([for replacing readdir],samba_cv_REPLACE_READDIR,[
        AC_TRY_RUN([
-#include "${srcdir-.}/lib/replace/repdir/repdir.c"
-#include "${srcdir-.}/build/tests/os2_delete.c"],
+#include "$libreplacedir/repdir/repdir.c"
+#include "$libreplacedir/test/os2_delete.c"],
                   samba_cv_REPLACE_READDIR=yes,samba_cv_REPLACE_READDIR=no)])
 fi
 

diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 70fd89e3b9a00d6e9b5abf0fa7ab9f1de32975f1..0c37b60febb30aea0a37a4d103f74953a78ace85 100644 (file)
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -25,8 +25,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef _replace_h
-#define _replace_h
+#ifndef _LIBREPLACE_REPLACE_H
+#define _LIBREPLACE_REPLACE_H
 
 #include "config.h"
 
@@ -360,4 +360,4 @@ typedef int bool;
 #undef HAVE_MMAP
 #endif
 
-#endif
+#endif /* _LIBREPLACE_REPLACE_H */

diff --git a/source4/build/tests/os2_delete.c b/source4/lib/replace/test/os2_delete.c
similarity index 100%
rename from source4/build/tests/os2_delete.c
rename to source4/lib/replace/test/os2_delete.c