diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-22 11:35:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-22 11:35:28 +0100 |
| commit | e490c1b8c858ea42e31ae1a6504c4788e0fb1545 (patch) | |
| tree | 850087c9403c37adfc54deaf831a3e729223fa9a /source4/build/m4 | |
| parent | 63e23a7d648cb608a9834b4397c0aed765a1d459 (diff) | |
| download | samba-e490c1b8c858ea42e31ae1a6504c4788e0fb1545.tar.gz samba-e490c1b8c858ea42e31ae1a6504c4788e0fb1545.tar.bz2 samba-e490c1b8c858ea42e31ae1a6504c4788e0fb1545.zip | |
Move configure test files to the top-level and share them between s3 and
s4.
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 2 | ||||
| -rw-r--r-- | source4/build/m4/check_ld.m4 | 6 | ||||
| -rw-r--r-- | source4/build/m4/public.m4 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 51531ca776..1683cb028a 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -51,7 +51,7 @@ if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then fi AC_MSG_CHECKING([for test routines]) -AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"], +AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"], AC_MSG_RESULT(yes), AC_MSG_ERROR([cant find test code. Aborting config]), AC_MSG_WARN([cannot run when cross-compiling])) diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4 index 3a74ffc239..48d6b333ef 100644 --- a/source4/build/m4/check_ld.m4 +++ b/source4/build/m4/check_ld.m4 @@ -137,7 +137,7 @@ if test $BLDSHARED = true; then ac_cv_shlib_works=no # try building a trivial shared library # TODO: also test SONAMEFLAG - ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o && + ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/../tests/shlib.c -o shlib.o && ${SHLD} ${SHLD_FLAGS} -o shlib.${SHLIBEXT} shlib.o && ac_cv_shlib_works=yes rm -f shlib.${SHLIBEXT} shlib.o @@ -146,7 +146,7 @@ if test $BLDSHARED = true; then [ac_cv_shmod_works],[ ac_cv_shmod_works=no # try building a trivial shared library - ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o && + ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/../tests/shlib.c -o shlib.o && ${MDLD} ${MDLD_FLAGS} -o shlib.${SHLIBEXT} shlib.o && ac_cv_shmod_works=yes rm -f shlib.${SHLIBEXT} shlib.o @@ -162,7 +162,7 @@ fi AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension]) AC_MSG_CHECKING([if we can link using the selected flags]) -AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"], +AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"], AC_MSG_RESULT(yes), AC_MSG_ERROR([we cannot link with the selected cc and ld flags. Aborting configure]), AC_MSG_WARN([cannot run when cross-compiling])) diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index a2b46a5287..ffd112f5f1 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -90,7 +90,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], OLD_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $$1_CFLAGS" AC_MSG_CHECKING([that the C compiler can use the $1_CFLAGS]) - AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"], + AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"], SMB_ENABLE($1, YES) AC_MSG_RESULT(yes), AC_MSG_RESULT(no), |