Commit ef1ac84c1006c7e8510099125482d1b0a4232b70
1 parent
576deccc
Exists in
master
Incluindo detecção correta da libdbus.
Showing
2 changed files
with
10 additions
and
2 deletions
Show diff stats
Makefile.in
| @@ -68,8 +68,8 @@ CXX=@CXX@ | @@ -68,8 +68,8 @@ CXX=@CXX@ | ||
| 68 | CC=@CC@ | 68 | CC=@CC@ |
| 69 | LD=@CXX@ | 69 | LD=@CXX@ |
| 70 | 70 | ||
| 71 | -LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ `$(PHPCONFIG) --libs` | ||
| 72 | -CFLAGS=@CFLAGS@ `$(PHPCONFIG) --includes` | 71 | +LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ @DBUS_LIBS@ `$(PHPCONFIG) --libs` |
| 72 | +CFLAGS=@CFLAGS@ @DBUS_CFLAGS@ `$(PHPCONFIG) --includes` | ||
| 73 | LDFLAGS=@LDFLAGS@ | 73 | LDFLAGS=@LDFLAGS@ |
| 74 | 74 | ||
| 75 | #---[ Rules ]---------------------------------------------------------------------------- | 75 | #---[ Rules ]---------------------------------------------------------------------------- |
configure.ac
| @@ -258,6 +258,14 @@ AC_CHECK_HEADER(libintl.h, [ | @@ -258,6 +258,14 @@ AC_CHECK_HEADER(libintl.h, [ | ||
| 258 | ]) | 258 | ]) |
| 259 | 259 | ||
| 260 | dnl --------------------------------------------------------------------------- | 260 | dnl --------------------------------------------------------------------------- |
| 261 | +dnl Check for D-Bus | ||
| 262 | +dnl --------------------------------------------------------------------------- | ||
| 263 | + | ||
| 264 | +PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) ) | ||
| 265 | +AC_SUBST(DBUS_LIBS) | ||
| 266 | +AC_SUBST(DBUS_CFLAGS) | ||
| 267 | + | ||
| 268 | +dnl --------------------------------------------------------------------------- | ||
| 261 | dnl Check for C++ 2011 support | 269 | dnl Check for C++ 2011 support |
| 262 | dnl --------------------------------------------------------------------------- | 270 | dnl --------------------------------------------------------------------------- |
| 263 | AC_DEFUN([AX_CHECK_COMPILE_FLAG], | 271 | AC_DEFUN([AX_CHECK_COMPILE_FLAG], |