diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2009-08-20 14:18:30 +0300 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2009-08-20 14:18:30 +0300 |
| commit | a2693f15612567c53c4b07af926b2c79191ad0f4 (patch) | |
| tree | b20308845f189ba87abe3802232b6b3244d72055 | |
| parent | b60aead245db0b7b0f56d5ff6f56203614384833 (diff) | |
| download | ofono-a2693f15612567c53c4b07af926b2c79191ad0f4.tar.bz2 | |
Fix make distcheck and clear GISI build flags when disabled
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 37198690..b4fae9fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -SUBDIRS = gdbus gatchat include plugins drivers unit src doc - -if WANT_ISI - SUBDIRS += gisi +if COND_ISI +MAYBE_ISI = gisi endif +SUBDIRS = gdbus gatchat $(MAYBE_ISI) include plugins drivers unit src doc + AM_MAKEFLAGS = --no-print-directory DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles diff --git a/configure.ac b/configure.ac index 796aa21b..2362b5ae 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,15 @@ AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads], AC_ARG_ENABLE(isi, AC_HELP_STRING([--disable-isi], [disable PhoNet/ISI protocol support]), [enable_isi=${enableval}]) -AM_CONDITIONAL(WANT_ISI, test "${enable_isi}" != "no") +AM_CONDITIONAL(COND_ISI, test "${enable_isi}" != "no") + +if (test "${enable_isi}" != "no"); then + GISI_CFLAGS='-I$(top_srcdir)' + GISI_LIBS='$(top_builddir)/gisi/libgisi.la' +fi + +AC_SUBST(GISI_CFLAGS) +AC_SUBST(GISI_LIBS) AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) @@ -90,9 +98,6 @@ AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)']) AC_SUBST([GATCHAT_CFLAGS], ['-I$(top_srcdir)/gatchat']) AC_SUBST([GATCHAT_LIBS], ['$(top_builddir)/gatchat/libgatchat.la']) -AC_SUBST([GISI_CFLAGS], ['-I$(top_srcdir)']) -AC_SUBST([GISI_LIBS], ['$(top_builddir)/gisi/libgisi.la']) - AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [don't install configuration and data files]), [enable_datafiles=${enableval}]) |