hal: Branch 'master'

Danny Kukawka dkukawka at kemper.freedesktop.org
Wed Nov 28 13:13:36 PST 2007


 configure.in |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 97e172d7ede25c597aef47ac4695fbcc42cd0685
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Nov 28 22:13:02 2007 +0100

    only print warning if HAL version missmatch
    
    Print only a warning (AC_MSG_WARN instead of AC_MSG_ERROR) if the check
    for the needed HAL version fails. Print a big warning in the configure
    summary at the end.

diff --git a/configure.in b/configure.in
index d438aae..b0d2ed5 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,10 @@ AC_PROG_LN_S
 PKG_PROG_PKG_CONFIG
 
 if ! $PKG_CONFIG --atleast-version 0.5.10 hal; then
-   AC_MSG_ERROR([hal 0.5.10 or later is required for this version of hal-info])
+   AC_MSG_WARN([hal 0.5.10 or later is required for this version of hal-info])
+   WRONG_HAL_VERSION=yes
+else 
+   WRONG_HAL_VERSION=no
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -69,9 +72,16 @@ tools/Makefile
 
 dnl ==========================================================================
 echo "
-                    hal-info $VERSION
-                  ========================
-
+                        hal-info $VERSION
+                     ======================== "
+if test x$WRONG_HAL_VERSION = xyes; then
+echo "  
+	================ !!! WARNING !!! ========================
+  	     You use a too old HAL version! You need at least
+               hal >= 0.5.10 to use this hal-info version!
+        ========================================================="
+fi
+echo "
         prefix:                                 ${prefix}
         datarootdir:                            ${datarootdir:-unused}
         datadir:                                ${datadir}


More information about the hal-commit mailing list