diff options
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1fe8df05..47fc9115 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -78,6 +78,12 @@ AC_DEFUN([AC_PATH_DBUS], [ AC_SUBST(DBUS_LIBS) ]) +AC_DEFUN([AC_PATH_GLIB], [ + PKG_CHECK_MODULES(GLIB, dbus-glib-1 > 0.35, glib_found=yes, AC_MSG_RESULT(no)) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) +]) + AC_DEFUN([AC_PATH_OPENOBEX], [ PKG_CHECK_MODULES(OPENOBEX, openobex > 1.1, openobex_found=yes, AC_MSG_RESULT(no)) AC_SUBST(OPENOBEX_CFLAGS) @@ -108,6 +114,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ fortify_enable=yes debug_enable=no pie_enable=no + glib_enable=${glib_found} obex_enable=${openobex_found} fuse_enable=no alsa_enable=no @@ -147,6 +154,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ dfutool_enable=${enableval} ]) + AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib support]), [ + glib_enable=${enableval} + ]) + AC_ARG_ENABLE(obex, AC_HELP_STRING([--enable-obex], [enable OBEX support]), [ obex_enable=${enableval} ]) @@ -204,6 +215,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ LDFLAGS="$LDFLAGS -pie" fi + AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(FUSE, test "${fuse_enable}" = "yes" && test "${openobex_found}" = "yes" && test "${fuse_found}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") diff --git a/configure.in b/configure.in index 2436e0ce..5489e0bc 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,7 @@ AC_FUNC_PPOLL AC_PATH_BLUEZ AC_PATH_DBUS +AC_PATH_GLIB AC_PATH_OPENOBEX AC_PATH_FUSE AC_PATH_ALSA |