sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Fix make distcheck and clear GISI build flags when disabled

This commit is contained in:
Aki Niemi 2009-08-20 14:18:30 +03:00
parent b60aead245
commit a2693f1561
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -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

13
configure.ac
View File

@ -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}])