--- configure.orig	2008-08-20 18:01:56.000000000 +0200
+++ configure	2012-11-24 17:08:09.000000000 +0100
@@ -51800,7 +51800,7 @@
 
             { echo "$as_me:$LINENO: checking HAL_LIBS" >&5
 echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6; }
-            HAL_LIBS=`$PKG_CONFIG --libs "hal > 0.5"`
+            HAL_LIBS=`$PKG_CONFIG --libs "hal-storage > 0.5"`
             { echo "$as_me:$LINENO: result: $HAL_LIBS" >&5
 echo "${ECHO_T}$HAL_LIBS" >&6; }
         else
@@ -53193,11 +53193,11 @@
 
             ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compile='$CXX -c $CXXFLAGS $USE_EXCEPTIONS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $USE_EXCEPTIONS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $USE_EXCEPTIONS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 
 
            kde_save_CXXFLAGS="$CXXFLAGS"