diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-13 10:13:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:33 -0500 |
| commit | c706319c8f0fe0af828da5f75c2dc673cecadf36 (patch) | |
| tree | 4ad3c298f11e34e18e14c3b72e3c0c36893048d5 /source4 | |
| parent | 2c3dc50953341c4f59cb46aed05be358dd9c3e81 (diff) | |
| download | samba-c706319c8f0fe0af828da5f75c2dc673cecadf36.tar.gz samba-c706319c8f0fe0af828da5f75c2dc673cecadf36.tar.bz2 samba-c706319c8f0fe0af828da5f75c2dc673cecadf36.zip | |
r18458: move wins32 stuff to the top dir
metze
(This used to be commit 521e94f2693eab9053d9e3f1bbc56cdf2e0adbcd)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 5 | ||||
| -rw-r--r-- | source4/lib/replace/replace.h | 2 | ||||
| -rw-r--r-- | source4/lib/replace/win32.m4 (renamed from source4/lib/replace/win32/config.m4) | 0 | ||||
| -rw-r--r-- | source4/lib/replace/win32_replace.h (renamed from source4/lib/replace/win32/replace.h) | 0 |
4 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index febee6409e..3a40b39da2 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -340,9 +340,10 @@ fi m4_include(dlfcn.m4) m4_include(getpass.m4) -m4_include(system/config.m4) -m4_include(win32/config.m4) +m4_include(win32.m4) m4_include(repdir.m4) +m4_include(system/config.m4) + AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],, [AC_MSG_ERROR([Required function not found])]) diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index a7ad58dd56..e35f1da44e 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -40,7 +40,7 @@ #include <errno.h> #if defined(_MSC_VER) || defined(__MINGW32__) -#include "lib/replace/win32/replace.h" +#include "win32_replace.h" #endif #ifdef __COMPAR_FN_T diff --git a/source4/lib/replace/win32/config.m4 b/source4/lib/replace/win32.m4 index 9ac84cdf2a..9ac84cdf2a 100644 --- a/source4/lib/replace/win32/config.m4 +++ b/source4/lib/replace/win32.m4 diff --git a/source4/lib/replace/win32/replace.h b/source4/lib/replace/win32_replace.h index 9901e72f6e..9901e72f6e 100644 --- a/source4/lib/replace/win32/replace.h +++ b/source4/lib/replace/win32_replace.h |