diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-14 09:59:24 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-14 09:59:24 +1100 |
| commit | bd614d28d48a187adcafffd301b0f70c154f4d38 (patch) | |
| tree | 9aee052f705317925073752ea68cfc8cf434984a /source4 | |
| parent | 80f7e9e08176592ad161a0707244ad9b52e964bd (diff) | |
| parent | 7db5e0a601968b9a5a978abd5a5a21b33913baf1 (diff) | |
| download | samba-bd614d28d48a187adcafffd301b0f70c154f4d38.tar.gz samba-bd614d28d48a187adcafffd301b0f70c154f4d38.tar.bz2 samba-bd614d28d48a187adcafffd301b0f70c154f4d38.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit d50b76ed71ab6bc8e63926540638df5af10202ae)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/config.mk | 2 | ||||
| -rw-r--r-- | source4/scripting/python/config.m4 | 2 | ||||
| -rw-r--r-- | source4/scripting/python/config.mk | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 45bfd8e81f..0235a9750c 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -471,6 +471,7 @@ OBJ_FILES = \ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/estrdup.ho \ ../heimdal/lib/roken/ecalloc.ho \ + ../heimdal/lib/roken/inet_aton.ho \ ../heimdal/lib/asn1/symbol.ho \ ../heimdal/lib/vers/print_version.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ @@ -500,6 +501,7 @@ OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/strupr.ho \ ../heimdal/lib/roken/setprogname.ho \ + ../heimdal/lib/roken/inet_aton.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ replace.ho PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4 index 2142cd9abd..aac98ebc60 100644 --- a/source4/scripting/python/config.m4 +++ b/source4/scripting/python/config.m4 @@ -22,6 +22,8 @@ AC_DEFUN([TRY_LINK_PYTHON], CFLAGS="$CFLAGS $2" AC_TRY_LINK([ + /* we have our own configure tests */ + #define Py_PYCONFIG_H 1 #include <Python.h> #include <stdlib.h> ],[ diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index a16d737344..09c77813ca 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -21,7 +21,7 @@ swig:: pythonmods .SUFFIXES: _wrap.c .i .i_wrap.c: - [ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $< + [ "$(SWIG)" = "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $< realdistclean:: @echo "Removing SWIG output files" |