Pinkbyte/yasnd
1
Fork 0
Code Releases Activity

split GAMMU variable to GAMMU_CFLAGS and GAMMU_LIBS

Browse Source
This commit is contained in:
Sergey Popov 2012-11-12 12:50:24 +04:00
parent da5e8d0353
commit badad6874c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -38,14 +38,17 @@ else
AC_ARG_WITH(gammu, [ --without-gammu do not use Gammu in daemon]) AC_ARG_WITH(gammu, [ --without-gammu do not use Gammu in daemon])
if test "${with_gammu}" != "no"; then if test "${with_gammu}" != "no"; then
GAMMU="" GAMMU_CFLAGS=""
GAMMU_LIBS=""
PKG_CHECK_MODULES([gammu], [gammu >= 1.0]) PKG_CHECK_MODULES([gammu], [gammu >= 1.0])
AC_CHECK_LIB([Gammu], [main], AC_CHECK_LIB([Gammu], [main],
[ [
AC_DEFINE([HAVE_LIBGAMMU], [1], [Define if you have libGammu]) 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
fi fi
AC_SUBST(DAEMON) AC_SUBST(DAEMON)

4
lib/Makefile.am
View File

@ -1,7 +1,7 @@
lib_LTLIBRARIES = libyasnd.la lib_LTLIBRARIES = libyasnd.la
libyasnd_la_SOURCES = libyasnd.c yasnd-gammu.c yasnd-log.c yasnd-lpt.c libyasnd_la_SOURCES = libyasnd.c yasnd-gammu.c yasnd-log.c yasnd-lpt.c
libyasnd_la_CPPFLAGS = -I$(top_srcdir) ${gammu_CFLAGS} libyasnd_la_CPPFLAGS = -I$(top_srcdir) @GAMMU_CFLAGS@
libyasnd_la_LIBADD = @GAMMU@ libyasnd_la_LIBADD = @GAMMU_LIBS@
distclean-local: distclean-local:
rm -f Makefile.in &>/dev/null rm -f Makefile.in &>/dev/null