Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 194873 | Differences between
and this patch

Collapse All | Expand All

(-)ksmserver-3.5.7.orig/configure.in.in (+96 lines)
Lines 274-276 Link Here
274
AC_ARG_WITH([composite],
274
AC_ARG_WITH([composite],
275
  AC_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
275
  AC_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
276
276
277
AC_ARG_WITH([hal],
278
  AS_HELP_STRING([--with-hal],[Enable HAL support  (default: check)]),[hal_test="$withval"],[hal_test="yes"])
279
280
if test "x$hal_test" = "xyes" ; then
281
282
########### Check for the HAL
283
  AC_MSG_CHECKING(for the HAL)
284
285
  hal_inc=NOTFOUND
286
  hal_lib=NOTFOUND
287
  hal=NOTFOUND
288
289
  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/hal /usr/local/include /usr/local/include/hal"
290
  AC_FIND_FILE(libhal.h libhal-storage.h, $search_incs, hal_incdir)
291
292
  if test -r $hal_incdir/libhal.h && test -r $hal_incdir/libhal-storage.h && grep LibHalVolume $hal_incdir/libhal-storage.h > /dev/null 2>&1; then
293
    HAL_INCS="-I$hal_incdir"
294
    hal_inc=FOUND
295
  fi
296
297
  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
298
  AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, hal_libdir)
299
300
  if test -r $hal_libdir/libhal.so && test -r $hal_libdir/libhal-storage.so ; then
301
    HAL_LIBS="-L$hal_libdir -lhal -lhal-storage"
302
    hal_lib=FOUND
303
  fi
304
305
  if test "$hal_inc" != FOUND || test "$hal_lib" != FOUND; then
306
    KDE_PKG_CHECK_MODULES( HAL, hal > 0.5, [ HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND; ] , AC_MSG_RESULT(Nothing found on PKG_CONFIG_PATH) )
307
  fi
308
309
  if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
310
      AC_MSG_RESULT(headers $HAL_INCS  libraries $HAL_LIBS)
311
      hal=FOUND
312
  else
313
      AC_MSG_RESULT(searched but not found)
314
  fi
315
316
317
  AC_SUBST(HAL_INCS)
318
  AC_SUBST(HAL_LIBS)
319
fi
320
321
322
AC_ARG_WITH([dbus],
323
  AS_HELP_STRING([--with-dbus],[Enable DBus support  (default: check)]),[dbus_test="$withval"],[dbus_test="yes"])
324
325
if test "x$dbus_test" = "xyes" ; then
326
########### Check for DBus
327
328
  AC_MSG_CHECKING(for DBus)
329
330
  dbus_inc=NOTFOUND
331
  dbus_lib=NOTFOUND
332
  dbus=NOTFOUND
333
334
  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
335
  AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
336
337
  search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include"
338
  AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
339
340
  if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then
341
    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
342
    dbus_inc=FOUND
343
  fi
344
345
  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
346
  AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
347
348
  if test -r $dbus_libdir/libdbus-1.so ; then
349
    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
350
    dbus_lib=FOUND
351
  fi
352
353
  if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then
354
    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 ) )
355
  fi
356
357
  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
358
  if test -z "$dbus_bus_var"; then
359
        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
360
  fi
361
  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
362
363
  if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
364
    AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
365
    dbus=FOUND
366
  else
367
    AC_MSG_RESULT(searched but not found)
368
  fi
369
370
  AC_SUBST(DBUS_INCS)
371
  AC_SUBST(DBUS_LIBS)
372
fi

Return to bug 194873