* m4/gspnlib.m4: Check for libgspnRG.a and libgspnSRG.a.
Define LIBGSPNRG_LDFLAGS and LIBGSPNSRG_LDFLAGS, not LIBGSPN_LDFLAGS. * iface/gspn/Makefile.am: Adjust, build dottygspn-rg and dottygspn-srg instead of dottygspn. * iface/gspn/gspn.cc (EVENT_TRUE): Undefine. (tgba_gspn_private_::~tgba_gspn_private_): Free all_indexes. * iface/gspn/dottygspn.cc (main): Destroy the automaton before its dictionnary.
This commit is contained in:
parent
44993317ea
commit
94a9543f38
5 changed files with 41 additions and 21 deletions
|
|
@ -9,21 +9,27 @@ AC_DEFUN([AX_CHECK_GSPNLIB], [
|
|||
if test x${with_gspn-yes} != xyes; then
|
||||
# Try to locate the headers and libraries.
|
||||
gspn_version_sh=$with_gspn/SOURCES/contrib/version.sh;
|
||||
AC_CHECK_FILE($gspn_version_sh,,
|
||||
[AC_MSG_ERROR(
|
||||
[Cannot find $gspn_version_sh. Check --with-gspn's argument.])])
|
||||
AC_CHECK_FILE($gspn_version_sh,,
|
||||
[AC_MSG_ERROR(
|
||||
[Cannot find $gspn_version_sh. Check --with-gspn's argument.])])
|
||||
gspn_version=`$gspn_version_sh`
|
||||
LIBGSPN_LDFLAGS="-L$with_gspn/$gspn_version/2bin/lib"
|
||||
LIBGSPN_CPPFLAGS="-I$with_gspn/SOURCES/WN/INCLUDE"
|
||||
fi
|
||||
LDFLAGS="$LDFLAGS $LIBGSPN_LDFLAGS"
|
||||
AC_CHECK_LIB([gspnRG], [initialize], [],
|
||||
AC_CHECK_LIB([gspnRG], [initialize], [],
|
||||
[AC_MSG_ERROR([Cannot find libgspnRG. Check --with-gspn's argument.])], [-lm -lfl])
|
||||
LIBGSPN_LDFLAGS="$LIBGSPN_LDFLAGS -lgspnRG -lm -lfl"
|
||||
LIBGSPNRG_LDFLAGS="$LIBGSPN_LDFLAGS -lgspnRG -lm -lfl"
|
||||
|
||||
LDFLAGS="$LDFLAGS $LIBGSPN_LDFLAGS"
|
||||
AC_CHECK_LIB([gspnSRG], [initialize], [],
|
||||
[AC_MSG_ERROR([Cannot find libgspnSRG. Check --with-gspn's argument.])], [-lm -lfl])
|
||||
LIBGSPNSRG_LDFLAGS="$LIBGSPN_LDFLAGS -lgspnSRG -lm -lfl"
|
||||
LDFLAGS="$ax_tmp_LDFLAGS"
|
||||
LIBS="$ax_tmp_LIBS"
|
||||
fi
|
||||
AM_CONDITIONAL([WITH_GSPN], [test x${with_gspn+set} = xset])
|
||||
AC_SUBST([LIBGSPN_CPPFLAGS])
|
||||
AC_SUBST([LIBGSPN_LDFLAGS])
|
||||
])
|
||||
AC_SUBST([LIBGSPNRG_LDFLAGS])]
|
||||
AC_SUBST([LIBGSPNSRG_LDFLAGS])
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue