Skip to contentSkip to conversation

also check for curl-devel and libxml2-devel

PATCH New Jan Beulich 1 participant 1 message May 14, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 also check for curl-devel and libxml2-devel

.. when those are required due to LIBXENAPI_BINDINGS being enabled.

tools/check/Makefile +2 -2
Index: 2007-04-18/tools/check/Makefile
===================================================================
@@ -7,7 +7,7 @@ all: build
 # Check this machine is OK for building on.
 .PHONY: build
 build:
-	XENFB_TOOLS=$(XENFB_TOOLS) ./chk build
+	XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk build
 
 # Check this machine is OK for installing on.
 # DO NOT use this check from 'make install' in the parent
@@ -15,7 +15,7 @@ build:
 # copy rather than actually installing.
 .PHONY: install
 install:
-	XENFB_TOOLS=$(XENFB_TOOLS) ./chk install
+	XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk install
 
 .PHONY: clean
 clean:
tools/check/check_curl new file +38 -0
Index: 2007-04-18/tools/check/check_curl
===================================================================
@@ -0,0 +1,38 @@
+#!/bin/sh
+# CHECK-BUILD CHECK-INSTALL
+
+if [ ! "$LIBXENAPI_BINDINGS" = "y" ]
+then
+    echo -n "unused, "
+    exit 0
+fi
+
+RC=0
+
+CURL_CONFIG="$(which curl-config)"
+tmpfile=$(mktemp)
+
+if test -z ${CURL_CONFIG}; then
+    RC=1
+else
+    ${CURL_CONFIG} --libs 2>&1 > /dev/null
+    RC=$?
+fi
+
+if test $RC -ne 0; then
+    echo "FAILED"
+	echo " *** curl-config is missing. "
+    echo " *** Please install curl-devel."
+elif ! ld $($CURL_CONFIG --libs) -o $tmpfile >/dev/null 2>&1; then
+    echo "FAILED"
+    echo " *** dependency libraries for curl are missing: "
+    RC=1
+    for i in $(ld $($CURL_CONFIG --libs) -o $tmpfile 2>&1 >/dev/null); do
+        case $i in
+        -l*) echo lib${i#-l}
+        esac
+    done
+fi
+rm -f $tmpfile
+
+exit $RC
tools/check/check_xml2 new file +38 -0
Index: 2007-04-18/tools/check/check_xml2
===================================================================
@@ -0,0 +1,38 @@
+#!/bin/sh
+# CHECK-BUILD CHECK-INSTALL
+
+if [ ! "$LIBXENAPI_BINDINGS" = "y" ]
+then
+    echo -n "unused, "
+    exit 0
+fi
+
+RC=0
+
+XML2_CONFIG="$(which xml2-config)"
+tmpfile=$(mktemp)
+
+if test -z ${XML2_CONFIG}; then
+    RC=1
+else
+    ${XML2_CONFIG} --libs 2>&1 > /dev/null
+    RC=$?
+fi
+
+if test $RC -ne 0; then
+    echo "FAILED"
+	echo " *** xml2-config is missing. "
+    echo " *** Please install libxml2-devel."
+elif ! ld $($XML2_CONFIG --libs) -o $tmpfile >/dev/null 2>&1; then
+    echo "FAILED"
+    echo " *** dependency libraries for xml2 are missing: "
+    RC=1
+    for i in $(ld $($XML2_CONFIG --libs) -o $tmpfile 2>&1 >/dev/null); do
+        case $i in
+        -l*) echo lib${i#-l}
+        esac
+    done
+fi
+rm -f $tmpfile
+
+exit $RC