* configure.ac, NEWS: Bump version to 0.0f.
* iface/gspn/simple.test, iface/gspn/dcswave.test, iface/gspn/dcswaveltl.test: Make sure the example directory is writable. * m4/lbtt.m4, m4/buddy.m4: Always configure buddy/ and lbtt/, regardless of the --with-included-buddy and --with-included-lbtt settings.
This commit is contained in:
parent
286405da95
commit
5b245d7dd1
8 changed files with 38 additions and 4 deletions
|
|
@ -17,12 +17,16 @@ AC_DEFUN([AX_CHECK_BUDDY], [
|
|||
fi
|
||||
|
||||
if test "$with_included_buddy" = yes; then
|
||||
AC_CONFIG_SUBDIRS([buddy])
|
||||
BUDDY_LDFLAGS='$(top_builddir)/buddy/src/libbdd.la'
|
||||
BUDDY_CPPFLAGS='-I$(top_srcdir)/buddy/src'
|
||||
else
|
||||
BUDDY_LDFLAGS='-lbdd'
|
||||
fi
|
||||
# We always configure BuDDy, this is needed to ensure
|
||||
# it gets distributed properly. Whether with_included_buddy is
|
||||
# set or not affects whether we *use* or *build* BuDDy.
|
||||
AC_CONFIG_SUBDIRS([buddy])
|
||||
|
||||
AM_CONDITIONAL([WITH_INCLUDED_BUDDY], [test "$with_included_buddy" = yes])
|
||||
AC_SUBST([BUDDY_LDFLAGS])
|
||||
AC_SUBST([BUDDY_CPPFLAGS])
|
||||
|
|
|
|||
|
|
@ -16,13 +16,17 @@ AC_DEFUN([AX_CHECK_LBTT], [
|
|||
fi
|
||||
|
||||
if test "$with_included_lbtt" = yes; then
|
||||
AC_CONFIG_SUBDIRS([lbtt])
|
||||
LBTT='${top_builddir}/lbtt/src/lbtt'
|
||||
LBTT_TRANSLATE='${top_builddir}/lbtt/src/lbtt-translate'
|
||||
else
|
||||
LBTT=lbtt
|
||||
LBTT_TRANSLATE=lbtt-translate
|
||||
fi
|
||||
# We always configure lbtt, this is needed to ensure
|
||||
# it gets distributed properly. Whether with_included_buddy is
|
||||
# set or not affects whether we *use* or *build* lbtt.
|
||||
AC_CONFIG_SUBDIRS([lbtt])
|
||||
|
||||
AM_CONDITIONAL([WITH_INCLUDED_LBTT], [test "$with_included_lbtt" = yes])
|
||||
AC_SUBST([LBTT])
|
||||
AC_SUBST([LBTT_TRANSLATE])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue