Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Regenerate configure to enable dbus
The configure script was out of date - re-running autogen.sh adds dbus
support.
- Loading branch information
Showing
with
77 additions
and
0 deletions.
-
+77
−0
configure
|
@@ -813,6 +813,7 @@ enable_video_dummy |
|
|
enable_video_opengl |
|
|
enable_video_opengles |
|
|
enable_libudev |
|
|
enable_dbus |
|
|
enable_input_tslib |
|
|
enable_pthreads |
|
|
enable_pthread_sem |
|
@@ -1536,6 +1537,7 @@ Optional Features: |
|
|
--enable-video-opengl include OpenGL support [[default=yes]] |
|
|
--enable-video-opengles include OpenGL ES support [[default=yes]] |
|
|
--enable-libudev enable libudev support [[default=yes]] |
|
|
--enable-dbus enable D-Bus support [[default=yes]] |
|
|
--enable-input-tslib use the Touchscreen library for input |
|
|
[[default=yes]] |
|
|
--enable-pthreads use POSIX threads for multi-threading |
|
|
|
|
fi |
|
|
} |
|
|
|
|
|
CheckDBus() |
|
|
{ |
|
|
# Check whether --enable-dbus was given. |
|
|
if test "${enable_dbus+set}" = set; then : |
|
|
enableval=$enable_dbus; |
|
|
else |
|
|
enable_dbus=yes |
|
|
fi |
|
|
|
|
|
if test x$enable_dbus = xyes; then |
|
|
# Extract the first word of "pkg-config", so it can be a program name with args. |
|
|
set dummy pkg-config; ac_word=$2 |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
|
$as_echo_n "checking for $ac_word... " >&6; } |
|
|
if ${ac_cv_path_PKG_CONFIG+:} false; then : |
|
|
$as_echo_n "(cached) " >&6 |
|
|
else |
|
|
case $PKG_CONFIG in |
|
|
[\\/]* | ?:[\\/]*) |
|
|
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
|
|
;; |
|
|
*) |
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
|
for as_dir in $PATH |
|
|
do |
|
|
IFS=$as_save_IFS |
|
|
test -z "$as_dir" && as_dir=. |
|
|
for ac_exec_ext in '' $ac_executable_extensions; do |
|
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
|
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
|
break 2 |
|
|
fi |
|
|
done |
|
|
done |
|
|
IFS=$as_save_IFS |
|
|
|
|
|
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" |
|
|
;; |
|
|
esac |
|
|
fi |
|
|
PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
|
|
if test -n "$PKG_CONFIG"; then |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
|
|
$as_echo "$PKG_CONFIG" >&6; } |
|
|
else |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
|
$as_echo "no" >&6; } |
|
|
fi |
|
|
|
|
|
|
|
|
if test x$PKG_CONFIG != xno; then |
|
|
DBUS_CFLAGS=`$PKG_CONFIG --cflags dbus-1` |
|
|
save_CFLAGS="$CFLAGS" |
|
|
CFLAGS="$save_CFLAGS $DBUS_CFLAGS" |
|
|
ac_fn_c_check_header_mongrel "$LINENO" "dbus/dbus.h" "ac_cv_header_dbus_dbus_h" "$ac_includes_default" |
|
|
if test "x$ac_cv_header_dbus_dbus_h" = xyes; then : |
|
|
have_dbus_dbus_h_hdr=yes |
|
|
else |
|
|
have_dbus_dbus_h_hdr=no |
|
|
fi |
|
|
|
|
|
|
|
|
CFLAGS="$save_CFLAGS" |
|
|
if test x$have_dbus_dbus_h_hdr = xyes; then |
|
|
|
|
|
$as_echo "#define HAVE_DBUS_DBUS_H 1" >>confdefs.h |
|
|
|
|
|
EXTRA_CFLAGS="$EXTRA_CFLAGS $DBUS_CFLAGS" |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
} |
|
|
|
|
|
CheckTslib() |
|
|
{ |
|
|
# Check whether --enable-input-tslib was given. |
|
|
|
|
CheckOpenGLX11 |
|
|
CheckOpenGLESX11 |
|
|
CheckLibUDev |
|
|
CheckDBus |
|
|
CheckInputEvents |
|
|
CheckTslib |
|
|
CheckUSBHID |