X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure.ac;h=eb3c14550f19fcb53721761cc7602fff67917794;hb=ce5570abb9cf48a994e99f4a87eeb5c3d0140369;hp=cfcd569f7ba0d6ff4a4ff292703ec1fa597b9500;hpb=4c80189d9747e21e5cd62bc38d9349e0584d8c50;p=util-vserver.git

diff --git a/configure.ac b/configure.ac
index cfcd569..eb3c145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,24 +351,18 @@ fi
 if test x"$ensc_have_libnl" = xyes; then
 	AC_CHECK_HEADERS([asm/types.h stdint.h], [ : ],
 			 [ ensc_have_libnl=no ])
-	for b in 8 16 32 64; do
-		for s in s u; do
-			ensc_libnl_stdint_type=
-			if test x"$s" = xu; then
-				ensc_libnl_stdint_type=u
-			fi
-			ensc_libnl_stdint_type="${ensc_libnl_stdint_type}int${b}_t"
-			AC_CHECK_TYPES([__${s}${b}], [ : ],
-				[AC_DEFINE_UNQUOTED([__${s}${b}],
-						[$ensc_libnl_stdint_type],
-						[__${s}${b} type])],
-				[AC_INCLUDES_DEFAULT()
+	AC_CHECK_TYPES([__s64], [ : ], [AC_DEFINE_UNQUOTED([__s64], [int64_t],
+		[Define this to a signed 64-bit integer type])],
+		[AC_INCLUDES_DEFAULT()
 #ifdef HAVE_ASM_TYPES_H
 #  include <asm/types.h>
-#endif]
-				)
-		done
-	done
+#endif])
+	AC_CHECK_TYPES([__u64], [ : ], [AC_DEFINE_UNQUOTED([__u64], [uint64_t],
+		[Define this to an unsigned 64-bit integer type])],
+		[AC_INCLUDES_DEFAULT()
+#ifdef HAVE_ASM_TYPES_H
+#  include <asm/types.h>
+#endif])
 fi
 
 if test x"$ensc_have_libnl" = xyes; then
@@ -381,7 +375,7 @@ if test x"$ensc_have_libnl" = xyes; then
 fi
 
 if test x"$ensc_have_libnl" = xyes; then
-	AC_CHECK_LIB(nl, rtnl_addr_alloc, [ : ],
+	AC_CHECK_LIB(nl, nlmsg_get_src, [ : ],
 		     [ ensc_have_libnl=no ])
 fi
 
@@ -400,6 +394,25 @@ dnl libnl stuff ends here}
 dnl
 dnl #######################
 
+dnl
+dnl Get python includes
+dnl
+
+AC_MSG_CHECKING([for python includes])
+PYTHON_INCLUDES=`python-config --includes 2>/dev/null`
+if test x"$PYTHON_INCLUDES" = x; then
+	python_inc_plat=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)"`
+	python_inc=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc()"`
+	if test x"$python_inc_plat" != x; then
+		PYTHON_INCLUDES="$PYTHON_INCLUDES -I$python_inc_plat"
+	fi
+	if test x"$python_inc" != x; then
+		PYTHON_INCLUDES="$PYTHON_INCLUDES -I$python_inc"
+	fi
+fi
+AC_MSG_RESULT([$PYTHON_INCLUDES])
+AC_SUBST(PYTHON_INCLUDES)
+
 
 dnl Check what distro this is, use Gentoo initscripts if appropriate
 AC_MSG_CHECKING([for host initscripts])
@@ -479,7 +492,7 @@ dnl final info-page ends here}
 dnl
 dnl ########################
 
-AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile])
+AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile python/Makefile])
 AC_OUTPUT
 
 AC_MSG_NOTICE([