X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=configure.ac;h=d5a19060d5cb7355823c070e26eed3185fb67d0f;hp=2274448abd38a6415d44ee87bd20de72212113cc;hb=HEAD;hpb=2f48c024c10366ed48cb6ab3bbfa35081f8d1242

diff --git a/configure.ac b/configure.ac
index 2274448..d5a1906 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,3 @@
-dnl $Id$
-
 dnl Copyright (C) 2002,2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 dnl  
 dnl This program is free software; you can redistribute it and/or modify
@@ -24,7 +22,7 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver-pl, 0.1, support@planet-lab.org)
+AC_INIT(util-vserver-pl, 0.3, support@planet-lab.org)
 AC_CONFIG_SRCDIR([python/vserverimpl.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -35,6 +33,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
 # Checks for programs.
+AC_LANG(C)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -77,11 +76,6 @@ dnl {check for libnl
 dnl
 
 ensc_have_libnl=yes
-LIBNL_ROOT=`readlink -f ../libnl*/`
-if test -d "$LIBNL_ROOT"; then
-	CFLAGS="$CFLAGS -I ${LIBNL_ROOT}/include"
-	LDFLAGS="$LDFLAGS -L${LIBNL_ROOT}/lib"
-fi
 
 if test x"$ensc_have_libnl" = xyes; then
 	AC_CHECK_HEADERS([asm/types.h stdint.h], [ : ],
@@ -110,8 +104,13 @@ if test x"$ensc_have_libnl" = xyes; then
 fi
 
 if test x"$ensc_have_libnl" = xyes; then
-	AC_CHECK_LIB(nl, nlmsg_get_src, [ : ],
-		     [ ensc_have_libnl=no ])
+	AC_CHECK_LIB(nl, nl_handle_alloc_cb, [
+		     AC_DEFINE(HAVE_LIBNL_1_1, [],
+		      [Define this to use the libnl 1.1 API])],
+		     [AC_CHECK_LIB(nl, nlmsg_get_src,
+		      [AC_DEFINE(HAVE_LIBNL_1_0, [],
+		       [Define this to use the libnl 1.0-pre6 API])],
+		     [ensc_have_libnl=no])])
 fi
 
 if test x"$ensc_have_libnl" != xyes; then
@@ -192,5 +191,5 @@ AC_SUBST(sysvdir)
 
 AC_DEFINE(_FILE_OFFSET_BITS, [64], [Use 64bit interface for filesystem operations])
 
-AC_CONFIG_FILES([util-vserver-pl.spec Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT