From 1710eca2594c3b43f7b0651a2f07429dbeb2a35d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Mar 2008 14:27:10 +0100 Subject: configure: when detecting python we should disable pyconfig.h This fixes the detection on HP-UX where the pyconfig.h contains bogus defines. metze (This used to be commit 9391f6f80461be2b214a881782aecf7df8a4aba3) --- source4/scripting/python/config.m4 | 2 ++ 1 file changed, 2 insertions(+) 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 #include ],[ -- cgit From 9f6355baa7520cd7955061fae210a5327ffd1a34 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 13 Mar 2008 14:30:23 +0100 Subject: fix build of asn1_compile when there is no system inet_aton() function. Michael (This used to be commit f1c2207b3d9411eac27cb85891f62e9d05bf5118) --- source4/heimdal_build/config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 45bfd8e81f..169e84e7f4 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 \ -- cgit From 9c7c6c7049ab67bd5d0cee992180602bc71fa9d1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Mar 2008 15:55:56 +0100 Subject: build: we don't rely on bash yet:-) '==' should be just '=' metze (This used to be commit 17997dd9bcd385fcf27646d832ad824cc2a0800a) --- source4/scripting/python/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit From 7db5e0a601968b9a5a978abd5a5a21b33913baf1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Mar 2008 16:26:37 +0100 Subject: build: compile_et also needs inet_aton() metze (This used to be commit b6bcd66612eb3e507da94eb6f05e5d0317a8276c) --- source4/heimdal_build/config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 169e84e7f4..0235a9750c 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -501,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 -- cgit