diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:46:22 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:46:22 +0200 |
| commit | 7fdca970407041af2f655690ddf1dc6a68d85fb7 (patch) | |
| tree | 481ab5a4c0aac872be76326f9f1278227dc0e291 /source3/lib/socket_wrapper/config.m4 | |
| parent | bf21371c098684ccad427a54ac76766c0021bc88 (diff) | |
| parent | 41669237cd714c59af9e634cb2ac162d6ee57e82 (diff) | |
| download | samba-7fdca970407041af2f655690ddf1dc6a68d85fb7.tar.gz samba-7fdca970407041af2f655690ddf1dc6a68d85fb7.tar.bz2 samba-7fdca970407041af2f655690ddf1dc6a68d85fb7.zip | |
Merge branch 'singlesw' into single
Conflicts:
source3/lib/socket_wrapper/socket_wrapper.c
source4/lib/replace/system/network.h
Diffstat (limited to 'source3/lib/socket_wrapper/config.m4')
| -rw-r--r-- | source3/lib/socket_wrapper/config.m4 | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/source3/lib/socket_wrapper/config.m4 b/source3/lib/socket_wrapper/config.m4 deleted file mode 100644 index f3ffb895a9..0000000000 --- a/source3/lib/socket_wrapper/config.m4 +++ /dev/null @@ -1,22 +0,0 @@ -AC_ARG_ENABLE(socket-wrapper, -[ --enable-socket-wrapper Turn on socket wrapper library (default=no)]) - -DEFAULT_TEST_OPTIONS= -HAVE_SOCKET_WRAPPER=no - -if eval "test x$developer = xyes"; then - enable_socket_wrapper=yes -fi - -if eval "test x$enable_socket_wrapper = xyes"; then - AC_DEFINE(SOCKET_WRAPPER,1,[Use socket wrapper library]) - DEFAULT_TEST_OPTIONS=--socket-wrapper - HAVE_SOCKET_WRAPPER=yes - - # this is only used for samba3 - SOCKET_WRAPPER_OBJS="lib/socket_wrapper/socket_wrapper.o" -fi - -AC_SUBST(DEFAULT_TEST_OPTIONS) -AC_SUBST(HAVE_SOCKET_WRAPPER) -AC_SUBST(SOCKET_WRAPPER_OBJS) |