diff options
| -rw-r--r-- | acinclude.m4 | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e3de19d6..af8c04b7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -93,43 +93,6 @@ AC_DEFUN([AC_PATH_BLUEZ], [ AC_SUBST(BLUEZ_LIBS) ]) -AC_DEFUN([AC_PATH_OPENOBEX], [ - openobex_prefix=${prefix} - - AC_ARG_WITH(openobex, AC_HELP_STRING([--with-openobex=DIR], [OpenOBEX library is installed in DIR]), [ - if (test "${withval}" != "yes"); then - openobex_prefix=${withval} - fi - ]) - - ac_save_CPPFLAGS=$CPPFLAGS - ac_save_LDFLAGS=$LDFLAGS - - OPENOBEX_CFLAGS="" - test -d "${openobex_prefix}/include" && OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS -I${openobex_prefix}/include" - - CPPFLAGS="$CPPFLAGS $OPENOBEX_CFLAGS" - AC_CHECK_HEADER(openobex/obex.h, openobex_found=yes, openobex_found=no) - - OPENOBEX_LIBS="" - if (test "${prefix}" = "${openobex_prefix}"); then - test -d "${libdir}" && OPENOBEX_LIBS="$OPENOBEX_LIBS -L${libdir}" - else - test -d "${openobex_prefix}/lib64" && OPENOBEX_LIBS="$OPENOBEX_LIBS -L${openobex_prefix}/lib64" - test -d "${openobex_prefix}/lib" && OPENOBEX_LIBS="$OPENOBEX_LIBS -L${openobex_prefix}/lib" - fi - - LDFLAGS="$LDFLAGS $OPENOBEX_LIBS" - AC_CHECK_LIB(openobex, OBEX_Init, OPENOBEX_LIBS="$OPENOBEX_LIBS -lopenobex", openobex_found=no) - AC_CHECK_LIB(openobex, BtOBEX_TransportConnect, AC_DEFINE(HAVE_BTOBEX_TRANSPORT_CONNECT, 1, [Define to 1 if you have the BtOBEX_TransportConnect() function.])) - - CPPFLAGS=$ac_save_CPPFLAGS - LDFLAGS=$ac_save_LDFLAGS - - AC_SUBST(OPENOBEX_CFLAGS) - AC_SUBST(OPENOBEX_LIBS) -]) - AC_DEFUN([AC_PATH_DBUS], [ dbus_prefix=${prefix} @@ -144,8 +107,10 @@ AC_DEFUN([AC_PATH_DBUS], [ DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE" test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0" + test -d "/usr/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I/usr/include/dbus-1.0" if (test "${prefix}" = "${dbus_prefix}"); then test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include" + test -d "/usr/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I/usr/lib/dbus-1.0/include" else test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include" test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include" @@ -173,6 +138,43 @@ AC_DEFUN([AC_PATH_DBUS], [ AC_SUBST(DBUS_LIBS) ]) +AC_DEFUN([AC_PATH_OPENOBEX], [ + openobex_prefix=${prefix} + + AC_ARG_WITH(openobex, AC_HELP_STRING([--with-openobex=DIR], [OpenOBEX library is installed in DIR]), [ + if (test "${withval}" != "yes"); then + openobex_prefix=${withval} + fi + ]) + + ac_save_CPPFLAGS=$CPPFLAGS + ac_save_LDFLAGS=$LDFLAGS + + OPENOBEX_CFLAGS="" + test -d "${openobex_prefix}/include" && OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS -I${openobex_prefix}/include" + + CPPFLAGS="$CPPFLAGS $OPENOBEX_CFLAGS" + AC_CHECK_HEADER(openobex/obex.h, openobex_found=yes, openobex_found=no) + + OPENOBEX_LIBS="" + if (test "${prefix}" = "${openobex_prefix}"); then + test -d "${libdir}" && OPENOBEX_LIBS="$OPENOBEX_LIBS -L${libdir}" + else + test -d "${openobex_prefix}/lib64" && OPENOBEX_LIBS="$OPENOBEX_LIBS -L${openobex_prefix}/lib64" + test -d "${openobex_prefix}/lib" && OPENOBEX_LIBS="$OPENOBEX_LIBS -L${openobex_prefix}/lib" + fi + + LDFLAGS="$LDFLAGS $OPENOBEX_LIBS" + AC_CHECK_LIB(openobex, OBEX_Init, OPENOBEX_LIBS="$OPENOBEX_LIBS -lopenobex", openobex_found=no) + AC_CHECK_LIB(openobex, BtOBEX_TransportConnect, AC_DEFINE(HAVE_BTOBEX_TRANSPORT_CONNECT, 1, [Define to 1 if you have the BtOBEX_TransportConnect() function.])) + + CPPFLAGS=$ac_save_CPPFLAGS + LDFLAGS=$ac_save_LDFLAGS + + AC_SUBST(OPENOBEX_CFLAGS) + AC_SUBST(OPENOBEX_LIBS) +]) + AC_DEFUN([AC_PATH_FUSE], [ fuse_prefix=${prefix} |