[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kioslave/media
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-10-02 7:56:19
Message-ID: 1128239779.046319.14973.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 466283 by coolo:

oops, I commited this in the wrong path


 M  +11 -11    configure.in.in  


--- branches/KDE/3.5/kdebase/kioslave/media/configure.in.in #466282:466283
@@ -22,7 +22,7 @@
   search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/hal \
/usr/local/include /usr/local/include/hal"  AC_FIND_FILE(libhal.h libhal-storage.h, \
$search_incs, hal_incdir)  
-  if [test -r $hal_incdir/libhal.h] && [test -r $hal_incdir/libhal-storage.h] ; then
+  if test -r $hal_incdir/libhal.h && test -r $hal_incdir/libhal-storage.h ; then
     HAL_INCS="-I$hal_incdir"
     hal_inc=FOUND
   fi
@@ -39,18 +39,18 @@
   search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff \
/usr/local/lib$kdelibsuff"  AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, \
hal_libdir)  
-  if [test -r $hal_libdir/libhal.so] && [test -r $hal_libdir/libhal-storage.so] ; \
then +  if test -r $hal_libdir/libhal.so && test -r $hal_libdir/libhal-storage.so ; \
then  HAL_LIBS="-L$hal_libdir -lhal -lhal-storage"
     hal_lib=FOUND
   fi
 
-  if [ test $hal_inc != FOUND ] || [ test $hal_lib != FOUND ]; then 
+  if test "$hal_inc" != FOUND || test "$hal_lib" != FOUND; then 
     KDE_PKG_CHECK_MODULES( HAL, hal, [ HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; \
hal_lib=FOUND; ] , AC_MSG_RESULT(Nothing found on PKG_CONFIG_PATH) )  fi
 
-  if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then
+  if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
       AC_MSG_RESULT(headers $HAL_INCS  libraries $HAL_LIBS)
-  	hal=FOUND
+      hal=FOUND
   else
       AC_MSG_RESULT(searched but not found)
   fi
@@ -74,7 +74,7 @@
   search_incs_arch_deps="$kde_includes $kde_extra_includes \
/usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include"  \
AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)  
-  if [test -r $dbus_incdir/dbus/dbus.h] && [test -r \
$dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then +  if test -r \
$dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; \
then  DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
     dbus_inc=FOUND
   fi
@@ -87,10 +87,10 @@
     dbus_lib=FOUND
   fi
 
-  if [ test $dbus_inc != FOUND ] || [ test $dbus_lib != FOUND ]; then 
+  if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
     KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; \
dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )  fi
-  if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then
+  if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
     AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
     dbus=FOUND
   else
@@ -129,7 +129,7 @@
     dbusqt_lib=FOUND
   fi
 
-  if [ test $dbusqt_inc != FOUND ] || [ test $dbusqt_lib != FOUND ]; then 
+  if test $dbusqt_inc != FOUND  || test $dbusqt_lib != FOUND ; then 
 
     search_incs="`pkg-config --cflags dbus-1  |sed 's/-I//g'`"
     AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
@@ -154,7 +154,7 @@
   fi
 
 
-  if [test $dbusqt_inc = FOUND] && [test $dbusqt_lib = FOUND] ; then
+  if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
     AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
     dbusqt=FOUND
   else
@@ -170,7 +170,7 @@
 AC_MSG_CHECKING(if the HAL backend for media:/ should be compiled)
 
 HALBACKEND=no
-if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = \
"xFOUND"] ; then +if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test \
"x$dbusqt" = "xFOUND" ; then  AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL \
backend compilation])  HALBACKEND=yes
   AC_SUBST(HALBACKEND)


[prev in list] [next in list] [prev in thread] [next in thread]