X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure.ac;h=04ac707da290db45cc845dec6c29502c1003b3cd;hb=7f96490a8a9e75ce02d5339171d605eb3996ef71;hp=56e7bc07b9b18cd5213414ccf1eb96eb2eb6ab92;hpb=4f1179ef1b3a7ca38250f381e6e523087664914a;p=util-vserver.git

diff --git a/configure.ac b/configure.ac
index 56e7bc0..04ac707 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,15 +342,42 @@ dnl {check for libnl
 dnl
 
 ensc_have_libnl=yes
-LIBNL_ROOT=`echo ../libnl*/`
+LIBNL_ROOT=`readlink -f ../libnl*/`
 if test -d "$LIBNL_ROOT"; then
-	CFLAGS="$CFLAGS -isystem $LIBNL_ROOT/include"
-	LDFLAGS="$LDFLAGS -L$LIBNL_ROOT/lib"
+	CFLAGS="$CFLAGS -I ${LIBNL_ROOT}/include"
+	LDFLAGS="$LDFLAGS -L${LIBNL_ROOT}/lib"
 fi
 
 if test x"$ensc_have_libnl" = xyes; then
-	AC_CHECK_HEADERS([netlink/netlink.h netlink/route/addr.h], [ : ],
+	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()
+#ifdef HAVE_ASM_TYPES_H
+#  include <asm/types.h>
+#endif]
+				)
+		done
+	done
+fi
+
+if test x"$ensc_have_libnl" = xyes; then
+	AC_CHECK_HEADERS([netlink/netlink.h netlink/route/addr.h], [ : ],
+			 [ ensc_have_libnl=no ], [AC_INCLUDES_DEFAULT()
+#ifdef HAVE_ASM_TYPES_H
+#  include <asm/types.h>
+#endif]
+		)
 fi
 
 if test x"$ensc_have_libnl" = xyes; then
@@ -373,6 +400,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])
@@ -452,7 +498,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([