From badad6874cf2f0a5275661bef22adcca5d8e69a9 Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Mon, 12 Nov 2012 12:50:24 +0400
Subject: [PATCH] split GAMMU variable to GAMMU_CFLAGS and GAMMU_LIBS

---
 configure.ac    | 9 ++++++---
 lib/Makefile.am | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ccaa03e..830ce70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,14 +38,17 @@ else
 
 	AC_ARG_WITH(gammu, [  --without-gammu        do not use Gammu in daemon])
 	if test "${with_gammu}" != "no"; then
-		GAMMU=""
+		GAMMU_CFLAGS=""
+		GAMMU_LIBS=""
 		PKG_CHECK_MODULES([gammu], [gammu >= 1.0])
 		AC_CHECK_LIB([Gammu], [main], 
 		[ 
 			AC_DEFINE([HAVE_LIBGAMMU], [1], [Define if you have libGammu])
-			GAMMU=${gammu_LIBS}
+			GAMMU_CFLAGS=${gammu_CFLAGS}
+			GAMMU_LIBS=${gammu_LIBS}
 		])
-		AC_SUBST(GAMMU)
+		AC_SUBST(GAMMU_CFLAGS)
+		AC_SUBST(GAMMU_LIBS)
 	fi
 fi
 AC_SUBST(DAEMON)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a12dc07..e47e73e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libyasnd.la
 libyasnd_la_SOURCES = libyasnd.c yasnd-gammu.c yasnd-log.c yasnd-lpt.c
-libyasnd_la_CPPFLAGS = -I$(top_srcdir) ${gammu_CFLAGS}
-libyasnd_la_LIBADD = @GAMMU@
+libyasnd_la_CPPFLAGS = -I$(top_srcdir) @GAMMU_CFLAGS@
+libyasnd_la_LIBADD = @GAMMU_LIBS@
 
 distclean-local:
 	rm -f Makefile.in &>/dev/null