[Libvirt-cim] [PATCH 4 of 5] Clean up configure a little bit

[Dan Smith]

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1197305646 28800
# Node ID 999e44674d82ed1351303ac73740cb61aa77bedf
# Parent  0c5b0d0f26f501f56393fe0455e28ee2a1730629
Clean up configure a little bit

Changes:
 - Added PKG_CONFIG_PATH for /usr/local package detection

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 0c5b0d0f26f5 -r 999e44674d82 acinclude.m4
--- a/acinclude.m4	Mon Dec 10 08:31:47 2007 -0800
+++ b/acinclude.m4	Mon Dec 10 08:54:06 2007 -0800
@@ -242,47 +242,6 @@ AC_DEFUN([CHECK_LIBVIRT],
 	LDFLAGS="$LDFLAGS $LIBVIRT_LIBS"
 	])
 
-dnl
-dnl The check for the SBLIM test suite
-dnl Sets the TESTSUITEDIR variable and the TESTSUITE conditional
-dnl
-
-AC_DEFUN([CHECK_TESTSUITE],
-	[
-	AC_MSG_CHECKING(for SBLIM testsuite)
-	_DIRS="$datadir/sblim-testsuite"
-	save_exec_prefix=${exec_prefix}
-	save_prefix=${prefix}
-	if test xNONE == x${prefix}; then
-		prefix=/usr/local
-	fi
-	if test xNONE == x${exec_prefix}; then
-		exec_prefix=$prefix
-	fi
-	for _name in $_DIRS
-	do
-	 	AC_MSG_CHECKING( $_name )
-		_xname=`eval echo $_name`
-		if test -x $_xname/run.sh ; then
-		  dnl Found it
-		  AC_MSG_RESULT(yes)
-		  if test x"$TESTSUITEDIR" == x; then
-		  	TESTSUITEDIR=$_name
-		  fi
-		  AC_SUBST(TESTSUITEDIR)
-		  break;
-		fi
-        done
-	if test x"$TESTSUITEDIR" == x ; then
-		AC_MSG_RESULT(no)
-	fi
-	AM_CONDITIONAL(TESTSUITE,[test x"$TESTSUITEDIR" != x])
-	exec_prefix=$save_exec_prefix
-	prefix=$save_prefix
-	]
-)
-
-
 # A convenience macro that spits out a fail message for a particular test
 #
 # AC_CHECK_FAIL($LIBNAME,$PACKAGE_SUGGEST,$URL,$EXTRA)
diff -r 0c5b0d0f26f5 -r 999e44674d82 configure.ac
--- a/configure.ac	Mon Dec 10 08:31:47 2007 -0800
+++ b/configure.ac	Mon Dec 10 08:54:06 2007 -0800
@@ -3,7 +3,6 @@ AC_INIT(libvirt CMPI provider, 0.1, danm
 AC_INIT(libvirt CMPI provider, 0.1, danms at us.ibm.com, libvirt-cim)
 
 AC_CONFIG_SRCDIR([src/Virt_ComputerSystem.c])
-#AC_CONFIG_FILES([xen-kvm-cmpi.spec])
 
 AC_CHECK_HEADERS([stdarg.h errno.h])
 AC_CHECK_FUNCS([popen pclose fgets asprintf vfprintf fprintf snprintf sscanf])
@@ -31,8 +30,6 @@ AC_ARG_VAR([CIMSERVER],[the target CIM s
 ])
 AC_ARG_VAR([PROVIDERDIR],[the directory where the CMPI providers will be install
 ed.])
-AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite is installed.
-])
 
 AC_ARG_WITH([kvm-max-nics],
 	    AC_HELP_STRING([--with-kvm-max-nics=X],
@@ -98,38 +95,12 @@ AC_CONFIG_FILES([
 
 AM_INIT_AUTOMAKE
 
-# Check for the required C compiler
 AC_PROG_CC
-
-# Check for LEX/YACC
-AC_PROG_LEX
-AC_PROG_YACC
-
-# Check if the C compiler supports 'const'
 AC_C_CONST
-
-# Check for the required libtool
 AC_PROG_LIBTOOL
-
-# Check for the required install program 
 AC_PROG_INSTALL
-
-# Check for some common required headers
 AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
-
-# Check if the system headers conform to ANSI C
 AC_HEADER_STDC
-
-# Check for specific add on libraries that we know we'll need
-#  - libuuid
-#AC_CHECK_LIB([uuid], [uuid_generate], [have_uuid=yes], [
-#    AC_CHECK_FAIL(libuuid,e2fsprogs-devel)
-#    ])
-
-#  - libxenstore
-#AC_CHECK_LIB([xenstore], [xs_read], [have_xen=yes], [
-#    AC_CHECK_FAIL(libxenstore,xen-devel)
-#    ])
 
 # Check for the required CMPI header files (this macro is defined in acinclude.m4)
 CHECK_CMPI
@@ -141,25 +112,13 @@ CHECK_PROVIDERDIR
 # Check for presense of a CIM server (this macro is defined in acinclude.m4)
 CHECK_CIMSERVER
 
-# Check for presense of libxml2 (this macro defined in acinclude.m4)
-AC_CHECK_PROG([found_xml2_config],[xml2-config],[yes])
-AM_CONDITIONAL([found_xml2_config], [test x$found_xml2_config = xyes])
+# Check for presence of libraries
+PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+CHECK_LIBVIRT
 CHECK_LIBXML2
-
-# Check for presense of libvirt (this macro is defined in acinclude.m4)
-CHECK_LIBVIRT
-
-# Check for the SBLIM testsuite (this macro is defined in acinclude.m4)
-CHECK_TESTSUITE
-if test x"$TESTSUITEDIR" == x; then
-   TESTSUITE_SUPPORT=Disabled
-else
-   TESTSUITE_SUPPORT=Enabled
-fi
+CHECK_LIBCU
 
 CFLAGS_STRICT="-Werror"
-
-CHECK_LIBCU
 
 AC_ARG_ENABLE([werror],
     [  --enable-werror         enable werror on builds [[default=yes]]],
@@ -178,10 +137,6 @@ echo "The following configuration option
 echo "The following configuration options have been selected:"
 echo "   CIMSERVER: " $CIMSERVER
 echo "   PROVIDERDIR: " $PROVIDERDIR
-echo "   TESTSUITE_SUPPORT: " $TESTSUITE_SUPPORT
-if test x"$TESTSUITEDIR" != x; then
-   echo "   TESTSUITEDIR: " $TESTSUITEDIR
-fi
 echo "   CPPFLAGS:" $CPPFLAGS
 echo
 echo "You can override these values by setting the corresponding"
@@ -193,4 +148,3 @@ AC_OUTPUT(libvirt-cim.spec)
 AC_OUTPUT(libvirt-cim.spec)
 
 echo "You may now run make"
-