summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-12 07:05:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:26 -0500
commit68201cc76b430c1122c0f3c665c9af649ba54311 (patch)
tree4072c4ecdd179f562d4c60cac37b8ad8986341d2
parent566466319e3113ab872499c2ed7eb430ac2260ab (diff)
downloadsamba-68201cc76b430c1122c0f3c665c9af649ba54311.tar.gz
samba-68201cc76b430c1122c0f3c665c9af649ba54311.tar.bz2
samba-68201cc76b430c1122c0f3c665c9af649ba54311.zip
r18419: fix include paths of the configure tests
metze (This used to be commit 8774eeb0dc8a72a9871d42bf1652ce4f7d4a29b7)
-rw-r--r--source4/lib/replace/getpass.m47
-rw-r--r--source4/lib/replace/repdir/config.m46
-rw-r--r--source4/lib/replace/replace.h6
-rw-r--r--source4/lib/replace/test/os2_delete.c (renamed from source4/build/tests/os2_delete.c)0
4 files changed, 10 insertions, 9 deletions
diff --git a/source4/lib/replace/getpass.m4 b/source4/lib/replace/getpass.m4
index d66be30564..3f008bbf4e 100644
--- 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 b17c92e7d6..b2a20ccee6 100644
--- 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 70fd89e3b9..0c37b60feb 100644
--- 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
index 288e4a5d8f..288e4a5d8f 100644
--- a/source4/build/tests/os2_delete.c
+++ b/source4/lib/replace/test/os2_delete.c