diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-05 12:13:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:13 -0500 |
| commit | 0dd630cfa7dc55b4ba4146bbef801bccc15a4c74 (patch) | |
| tree | ebc2b7a89fb520f5e61977adfe2d6afd7d558aed | |
| parent | 81fdc61c114b66b8e58d5032d05029e5188a04eb (diff) | |
| download | samba-0dd630cfa7dc55b4ba4146bbef801bccc15a4c74.tar.gz samba-0dd630cfa7dc55b4ba4146bbef801bccc15a4c74.tar.bz2 samba-0dd630cfa7dc55b4ba4146bbef801bccc15a4c74.zip | |
r18085: using m4_include() instead of sinclude() means we get an error if the
include fails - thats better than the compile failing mysteriously
(This used to be commit b4df3c73913557297e0eb1ea89cb42a8e7920de8)
| -rw-r--r-- | source4/lib/replace/configure.ac | 6 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/replace/configure.ac b/source4/lib/replace/configure.ac index b46dfdced0..bd500ae8d4 100644 --- a/source4/lib/replace/configure.ac +++ b/source4/lib/replace/configure.ac @@ -12,7 +12,7 @@ if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings" fi -sinclude(libreplace.m4) -sinclude(win32/config.m4) -sinclude(repdir/config.m4) +m4_include(libreplace.m4) +m4_include(win32/config.m4) +m4_include(repdir/config.m4) AC_OUTPUT(Makefile) diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index 18b9a1a6e6..ce42367212 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -146,8 +146,8 @@ AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],, [AC_MSG_ERROR([Required function not found])]) -sinclude(getpass.m4) -sinclude(cc_features.m4) +m4_include(getpass.m4) +m4_include(cc_features.m4) LIBREPLACE_C99_STRUCT_INIT(c99_struct_initialization=yes, c99_struct_initialization=no) |