summaryrefslogtreecommitdiffstats
path: root/amarok/configure.in.in
diff options
context:
space:
mode:
Diffstat (limited to 'amarok/configure.in.in')
-rw-r--r--amarok/configure.in.in16
1 files changed, 15 insertions, 1 deletions
diff --git a/amarok/configure.in.in b/amarok/configure.in.in
index 539d07c2..40c0a034 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -313,7 +313,7 @@ if test "$build_yauap" != "no"; then
LIB_YAUAP=""
CFLAGS_YAUAP=""
else
- LIB_YAUAP="$DBUS_LIBS -ldbus-qt-1"
+ LIB_YAUAP="$DBUS_LIBS -ldbus-tqt-1"
CFLAGS_YAUAP="$DBUS_CFLAGS"
AC_SUBST(LIB_YAUAP)
AC_SUBST(CFLAGS_YAUAP)
@@ -834,7 +834,21 @@ AC_ARG_WITH(ifp,
if test "$build_ifp" != "no"; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+
+ save_CXXFLAGS="$CXXFLAGS"
+ save_LIBS="$LIBS"
+ save_LDFLAGS="$LDFLAGS"
+
AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [])
+
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$save_LIBS"
+ LDFLAGS="$save_LDFLAGS"
+ AC_LANG_RESTORE
+
+# AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [])
AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
if test "$have_ifp" = "yes"; then