[Xen-changelog] [xen-unstable] Revert changeset 20898:8c1889297084

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1265312419 0
# Node ID 7b751b0e6f1bc7485b0718e634ed7cb9ce9ab68c
# Parent  3c3759296796ae9b986c1ec295ce66b654589f7f
Revert changeset 20898:8c1889297084
---
 tools/check/check_libconfig_devel |    6 ------
 tools/libxl/Makefile              |   23 +++++++++++++++++++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff -r 3c3759296796 -r 7b751b0e6f1b tools/check/check_libconfig_devel
--- a/tools/check/check_libconfig_devel Thu Feb 04 13:16:39 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-# CHECK-BUILD
-
-. ./funcs.sh
-
-has_header libconfig.h || fail "missing libconfig headers (package 
libconfig-devel)"
diff -r 3c3759296796 -r 7b751b0e6f1b tools/libxl/Makefile
--- a/tools/libxl/Makefile      Thu Feb 04 13:16:39 2010 +0000
+++ b/tools/libxl/Makefile      Thu Feb 04 19:40:19 2010 +0000
@@ -13,6 +13,11 @@ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
 
 LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
+
+#LIBCONFIG_URL ?= http://www.hyperrealm.com/libconfig
+LIBCONFIG_URL = $(XEN_EXTFILES_URL)
+LIBCONFIG_SOURCE = libconfig-1.3.2
+LIBCONFIG_OUTPUT = $(LIBCONFIG_SOURCE)/.libs
 
 LIBXL_OBJS-y = osdeps.o
 LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o 
libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
@@ -34,11 +39,18 @@ libxenlight.a: $(LIBXL_OBJS)
 libxenlight.a: $(LIBXL_OBJS)
        $(AR) rcs libxenlight.a $^
 
-xl.o: xl.c
-       $(CC) $(CFLAGS) -c xl.c
+$(LIBCONFIG_SOURCE).tar.gz:
+       $(WGET) $(LIBCONFIG_URL)/$@
 
-$(CLIENTS): xl.o libxenlight.so
-       $(CC) $(LDFLAGS) -o $@ $< $(LIBS) -L . -lxenlight -lconfig
+$(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz
+       [ ! -d "$(LIBCONFIG_SOURCE)" ] && tar xzf $<
+       cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(PREFIX) 
--libdir=$(LIBDIR) --disable-cxx && $(MAKE)
+
+xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so xl.c
+       $(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c
+
+$(CLIENTS): xl.o libxenlight.so $(LIBCONFIG_OUTPUT)/libconfig.so
+       $(CC) $(LDFLAGS) -o $@ $< $(LIBS) -L . -lxenlight -L$(LIBCONFIG_OUTPUT) 
-lconfig
 
 .PHONY: install
 install: all
@@ -48,11 +60,14 @@ install: all
        ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
        $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR)
+       cd $(LIBCONFIG_SOURCE) && DESTDIR=$(DESTDIR) $(MAKE) install
 
 .PHONY: clean
 clean:
        $(RM) -f *.o *.so* *.a $(CLIENTS) $(DEPS)
+       $(RM) -rf $(LIBCONFIG_SOURCE)
 
 distclean: clean
+       $(RM) -f $(LIBCONFIG_SOURCE).tar.gz
 
 -include $(DEPS)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog