comparison configure.ac @ 11903:c9312177821a

[gaim-migrate @ 14194] "make distcheck" fixes - mostly fixing DBUS things so they can compile outside the source tree, and a few compile warning fixes. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 30 Oct 2005 17:24:38 +0000
parents f3a0cefa8e35
children 3edbb29daa0c
comparison
equal deleted inserted replaced
11902:391acec18e46 11903:c9312177821a
416 AC_ARG_WITH(dbus-session-dir, [ --with-dbus-session-dir=<dir> Location of the D-BUS session directory.]) 416 AC_ARG_WITH(dbus-session-dir, [ --with-dbus-session-dir=<dir> Location of the D-BUS session directory.])
417 417
418 if test "x$enable_dbus" = "xyes" ; then 418 if test "x$enable_dbus" = "xyes" ; then
419 AC_MSG_CHECKING([location of the D-BUS session directory]) 419 AC_MSG_CHECKING([location of the D-BUS session directory])
420 if ! test -z "$with_dbus_session_dir"; then 420 if ! test -z "$with_dbus_session_dir"; then
421 if ! test -d "$with_dbus_session_dir"; then 421 if ! test -d "$with_dbus_session_dir"; then
422 AC_MSG_WARN([$with_dbus_session_dir does not exist, if this is the correct location please make sure that it exists.]) 422 AC_MSG_WARN([$with_dbus_session_dir does not exist, if this is the correct location please make sure that it exists.])
423 enable_dbus=no 423 enable_dbus=no
424 fi 424 fi
425 425 DBUS_SESSION_DIR="$with_dbus_session_dir"
426 DBUS_SESSION_DIR="$with_dbus_session_dir"
427 else 426 else
428 dnl # add more to this as needed 427 dnl # add more to this as needed
429 servicesprefixes="$DATADIR $LIBDIR /usr/share /usr/local/share" 428 servicesprefixes="$DATADIR $LIBDIR /usr/share /usr/local/share"
430 DBUS_SESSION_DIR="" 429 DBUS_SESSION_DIR=""
431 430
440 if test -z $DBUS_SESSION_DIR; then 439 if test -z $DBUS_SESSION_DIR; then
441 AC_MSG_WARN([D-BUS session directory was not found! Please use --with-dbus-session-dir and specify its location.]) 440 AC_MSG_WARN([D-BUS session directory was not found! Please use --with-dbus-session-dir and specify its location.])
442 enable_dbus=no 441 enable_dbus=no
443 fi 442 fi
444 fi 443 fi
445
446
447 fi 444 fi
448 445
449 if test "x$enable_dbus" = "xyes" ; then 446 if test "x$enable_dbus" = "xyes" ; then
450 AC_MSG_RESULT([$DBUS_SESSION_DIR]) 447 AC_MSG_RESULT([$DBUS_SESSION_DIR])
451 AC_SUBST(DBUS_SESSION_DIR) 448 AC_SUBST(DBUS_SESSION_DIR)