hal: Branch 'origin'

[David Zeuthen]

 configure.in |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

New commits:
diff-tree 64fc3f3974074ca3424ede4ca82d993d4bb8ad46 (from 7c89fcb406bac11e92570ec71dbfb4e66789f87c)
Author: William Jon McCann <mccann at jhu.edu>
Date:   Mon Feb 12 15:51:28 2007 -0500

    two build fixes
    
    It seems that in order to detect libsmbios correctly the AC_CHECK_LIB
    needs to be wrapped with AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]).
    
    Also if --disable-gtk-doc is used then all the PKG_CHECK_MODULES()
    fail.  It seems that pkg-config stuff is only initialized in the
    GTK_DOC_CHECK macro.

diff --git a/configure.in b/configure.in
index 5411b18..0fea63b 100644
--- a/configure.in
+++ b/configure.in
@@ -37,6 +37,7 @@ AC_PROG_MAKE_SET
 AC_PROG_LN_S
 AM_PATH_PYTHON
 AC_SYS_LARGEFILE
+PKG_PROG_PKG_CONFIG
 
 AC_CHECK_HEADERS([sys/ioccom.h])
 
@@ -300,10 +301,12 @@ else
 	AM_CONDITIONAL(HAVE_LIBUSB,false)
 fi
 
-dnl Check for libsmbios 
+dnl Check for libsmbios
+AC_LANG_PUSH([C++])
 AC_CHECK_LIB(smbios, SMBIOSFreeMemory, LIB_SMBIOS=yes , LIB_SMBIOS=no )
-if test "$LIB_SMBIOS" = "yes" ; then 
-   AC_MSG_CHECKING(for libsmbios >= 0.11.6 )	
+AC_LANG_POP([C++])
+if test "$LIB_SMBIOS" = "yes" ; then
+   AC_MSG_CHECKING(for libsmbios >= 0.11.6 )
    AC_TRY_RUN(
    #include <smbios/version.h>
    int main ()
@@ -311,15 +314,15 @@ if test "$LIB_SMBIOS" = "yes" ; then 
         int major ;
         int minor ;
         int micro ;
-	
+
         if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
 	    if ((major == 0 && minor == 11 && micro >= 6) ||
                (major >= 0 && minor > 11)) {
-		return 0; 
-	    } 
+		return 0;
+	    }
 	}
 	return 1;
-   } , [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)], 
+   } , [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
        [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
 else
   USE_SMBIOS=no