hal: Branch 'master'

Danny Kukawka dkukawka at kemper.freedesktop.org
Tue Mar 27 08:14:06 PDT 2007


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

New commits:
diff-tree 37e05be988f6f0bb65b840aed560bd42a4fde850 (from ad99a02cbc46cccf6ca7aa13dc02c13ff9ae4253)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 27 17:13:16 2007 +0200

    fixed quoting and added allowed libparted versions to error output
    
    Fixed quoting in AC_MSG_CHECKING() blocks and added allowed version
    numbers of libparted to error-output.

diff --git a/configure.in b/configure.in
index 7dca7d9..66e4ef2 100644
--- a/configure.in
+++ b/configure.in
@@ -167,7 +167,7 @@ if test "x$use_parted" = "xyes" ; then
    AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used])
    AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
    AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
-   AC_MSG_CHECKING(for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6)
+   AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6])
    LDFLAGS=-lparted
    AC_TRY_RUN(
    #include <stdio.h>
@@ -190,7 +190,7 @@ if test "x$use_parted" = "xyes" ; then
 
 	return 1;
     }
-	,AC_MSG_RESULT( ),AC_MSG_ERROR(*** Requires libparted == 1.7.1) )
+	,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6]) )
     PARTED_LIBS=-lparted
     AC_SUBST(PARTED_LIBS)
     LDFLAGS=
@@ -319,7 +319,7 @@ AC_LANG_PUSH([C++])
 AC_CHECK_LIB(smbios, SMBIOSFreeMemory, LIB_SMBIOS=yes , LIB_SMBIOS=no )
 AC_LANG_POP([C++])
 if test "$LIB_SMBIOS" = "yes" ; then
-   AC_MSG_CHECKING(for libsmbios >= 0.13.4 )
+   AC_MSG_CHECKING([for libsmbios >= 0.13.4])
    AC_TRY_RUN(
    #include <smbios/version.h>
    int main ()
@@ -492,7 +492,7 @@ esac
 AC_CHECK_TYPE(pgoff_t, ,
               [AC_DEFINE(pgoff_t, unsigned long, [Index into the pagecache])],
                /usr/include/sys/types.h)
-AC_MSG_CHECKING(for BLKGETSIZE64)
+AC_MSG_CHECKING([for BLKGETSIZE64])
 AC_TRY_COMPILE(
 [#include <sys/types.h>
 #include <linux/ioctl.h>
@@ -793,7 +793,7 @@ if test x$ENABLE_SONYPIC != "xno" ; then
 	],
 	have_sonypic=yes
 	)
-	AC_MSG_CHECKING(for Sony PIC headers)
+	AC_MSG_CHECKING([for Sony PIC headers])
 	AC_MSG_RESULT([$have_sonypic])
 
 	if test "x$ENABLE_SONYPIC" = "xyes" && test "x$have_sonypic" != "xyes" ; then


More information about the hal-commit mailing list