use config.h to define the lxcpath and co

configure.ac

@@ -25,6 +25,11 @@ AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(LXCPATH, "${localstatedir}/lib/lxc")
 AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
 
+AH_TEMPLATE([LXCPATH], [lxc configuration repository])
+AH_TEMPLATE([LXCLIBEXECDIR], [lxc executable library path])
+AC_DEFINE_UNQUOTED(LXCPATH, "$LXCPATH")
+AC_DEFINE_UNQUOTED(LXCLIBEXECDIR, "$LIBEXECDIR")
+
 AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h],
                  [],
                  AC_MSG_ERROR([netlink headers not found. Please install the linux kernel headers.]),

src/lxc/Makefile.am

-INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"@LXCPATH@\"" \
-	  -DLXCBINDIR="\"$(bindir)\"" \
-	  -DLXCLIBEXECDIR="\"$(libexecdir)\""
+AM_CFLAGS= -I$(top_srcdir)/src
+
 lib_LTLIBRARIES = liblxc.la
 pkginclude_HEADERS = \
 		start.h \

src/lxc/cgroup.c

@@ -37,6 +37,7 @@
 #include <net/if.h>
 
 #include "error.h"
+#include "config.h"
 
 #include <lxc/lxc.h>
 #include <lxc/log.h>

src/lxc/conf.c

@@ -48,6 +48,7 @@
 #include "network.h"
 #include "error.h"
 #include "parse.h"
+#include "config.h"
 
 #include <lxc/lxc.h>
 #include <lxc/log.h>

src/lxc/create.c

@@ -32,11 +32,12 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-
 #include "error.h"
 #include <lxc/lxc.h>
 #include <lxc/log.h>
 
+#include "config.h"
+
 lxc_log_define(lxc_create, lxc);
 
 static int dir_filter(const struct dirent *dirent)

src/lxc/destroy.c

@@ -33,6 +33,8 @@
 #include <lxc/lxc.h>
 #include <lxc/log.h>
 
+#include "config.h"
+
 lxc_log_define(lxc_destroy, lxc);
 
 static int remove_lxc_directory(const char *dirname)

src/lxc/lock.c

@@ -31,6 +31,8 @@
 #include <sys/param.h>
 
 #include "error.h"
+#include "config.h"
+
 #include <lxc/lxc.h>
 
 lxc_log_define(lxc_lock, lxc);

src/lxc/lxc_checkpoint.c

@@ -29,6 +29,7 @@
 
 #include <lxc.h>
 #include "arguments.h"
+#include "config.h"
 
 lxc_log_define(lxc_checkpoint, lxc);
 

src/lxc/lxc_execute.c

@@ -34,6 +34,7 @@
 #include <lxc/lxc.h>
 #include "confile.h"
 #include "arguments.h"
+#include "config.h"
 
 lxc_log_define(lxc_execute, lxc);
 

src/lxc/namespace.h

@@ -24,7 +24,6 @@
 #define __namespace_h
 
 #include <syscall.h>
-#define _GNU_SOURCE
 #include <sched.h>
 
 #ifndef CLONE_FS

src/lxc/state.c

@@ -34,6 +34,7 @@
 #include <lxc/lxc.h>
 #include <lxc/log.h>
 #include "commands.h"
+#include "config.h"
 
 lxc_log_define(lxc_state, lxc);