From 3a2cdebbbf6d92b19ce34a86ab5978ac3f75e942 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 18 Nov 2011 06:56:07 +0000
Subject: [PATCH] =?UTF-8?q?E17:=20fix=20eeze=20mount=20detection=20and=20b?=
 =?UTF-8?q?uild,=20reported=20by=20Jochen=20Schr=C3=B6der?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN revision: 65368
---
 configure.ac             | 6 ++++++
 src/bin/e_fm/Makefile.am | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2abda9370..61a47f4f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,6 +397,10 @@ AC_MSG_RESULT([${e_cv_want_mount_eeze}])
 eeze_mount=
 EEZE_MOUNT_CONFIG=0
 if test "x$e_cv_want_mount_eeze" != "xno" ; then
+      CPPFLAGS_save="$CPPFLAGS"
+      LIBS_save="$LIBS"
+      CPPFLAGS="$EEZE_CFLAGS $CPPFLAGS"
+      LIBS="$EEZE_LIBS $LIBS"
       AC_CHECK_LIB([eeze], [eeze_disk_function],
         [
            eeze_mount="eeze >= 1.0.999 ecore-con >= 1.0.999"
@@ -409,6 +413,8 @@ if test "x$e_cv_want_mount_eeze" != "xno" ; then
            e_cv_want_mount_eeze=no
         ]
       )
+      CPPFLAGS="$CPPFLAGS_save"
+      LIBS="$LIBS_save"
 else
   AC_MSG_NOTICE([eeze mounting disabled])
 fi
diff --git a/src/bin/e_fm/Makefile.am b/src/bin/e_fm/Makefile.am
index a0ef6a0d3..d753880be 100644
--- a/src/bin/e_fm/Makefile.am
+++ b/src/bin/e_fm/Makefile.am
@@ -36,8 +36,8 @@ udisks_s =
 endif
 
 if HAVE_EEZE_MOUNT
-AM_CFLAGS += @EET_CFLAGS@
-LIBS += @EET_LIBS@
+AM_CFLAGS += @EEZE_CFLAGS@ @EET_CFLAGS@
+LIBS += @EEZE_LIBS@ @EET_LIBS@
 eeze_s = \
 ../e_prefix.c \
 e_fm_main_eeze.h \