| … | … | @@ -6,7 +6,7 @@ |
| 6 | 6 | # |
| 7 | 7 | # Don't end the URLs with a slash even if it appears in the official address, |
| 8 | 8 | # because we may append a component. Also, they cannot include "!". |
| 9 | | AC_INIT([link-grammar],[5.12.9],[https://github.com/opencog/link-grammar],[], |
| 9 | AC_INIT([link-grammar],[5.13.0],[https://github.com/opencog/link-grammar],[], |
| 10 | 10 | [https://opencog.github.io/link-grammar-website]) |
| 11 | 11 | |
| 12 | 12 | # Check whether we want to set defaults for CFLAGS and CXXFLAGS |
| … | … | @@ -35,11 +35,11 @@ dnl 4a) Increment when removing or changing interfaces. |
| 35 | 35 | LINK_MAJOR_VERSION=5 |
| 36 | 36 | dnl 4a) 5) Increment when adding interfaces. |
| 37 | 37 | dnl 6) Set to zero when removing or changing interfaces. |
| 38 | | LINK_MINOR_VERSION=12 |
| 38 | LINK_MINOR_VERSION=13 |
| 39 | 39 | dnl 3) Increment when interfaces not changed at all, |
| 40 | 40 | dnl only bug fixes or internal changes made. |
| 41 | 41 | dnl 4b) Set to zero when adding, removing or changing interfaces. |
| 42 | | LINK_MICRO_VERSION=9 |
| 42 | LINK_MICRO_VERSION=0 |
| 43 | 43 | dnl |
| 44 | 44 | dnl Set this too |
| 45 | 45 | MAJOR_VERSION_PLUS_MINOR_VERSION=`expr $LINK_MAJOR_VERSION + $LINK_MINOR_VERSION` |
| … | … | @@ -505,17 +505,17 @@ AC_CHECK_HEADER([opencog/atomspace/AtomSpace.h], [AtomSpaceFound=yes], AtomSpace |
| 505 | 505 | AC_LANG_POP() |
| 506 | 506 | |
| 507 | 507 | AC_LANG_PUSH([C++]) |
| 508 | | AC_CHECK_HEADER([opencog/nlp/types/atom_types.h], [NLPTypesFound=yes], NLPTypesFound=no) |
| 508 | AC_CHECK_HEADER([opencog/lg/types/atom_types.h], [LGTypesFound=yes], LGTypesFound=no) |
| 509 | 509 | AC_LANG_POP() |
| 510 | 510 | |
| 511 | 511 | AM_CONDITIONAL(HAVE_ATOMSPACE, test x${AtomSpaceFound} = xyes) |
| 512 | | AM_CONDITIONAL(HAVE_NLPTYPES, test x${NLPTypesFound} = xyes) |
| 512 | AM_CONDITIONAL(HAVE_LGTYPES, test x${LGTypesFound} = xyes) |
| 513 | 513 | |
| 514 | 514 | HaveAtomese=no |
| 515 | | if test x"${AtomSpaceFound}" = xyes && test x"${NLPTypesFound}" = xyes; then |
| 515 | if test x"${AtomSpaceFound}" = xyes && test x"${LGTypesFound}" = xyes; then |
| 516 | 516 | HaveAtomese=yes |
| 517 | 517 | AC_DEFINE(HAVE_ATOMESE, 1, [Define for compilation]) |
| 518 | | ATOMSPACE_LIBS="-latom_types -lnlp-types -lstorage-types -lsexpr -lpersist-flow -Wl,--no-as-needed -lpersist-rocks -lpersist-monospace -lpersist-cog -lpersist-cog-simple -lpersist-file -Wl,--as-needed -lpersist -latomspace -L/usr/local/lib/opencog/" |
| 518 | ATOMSPACE_LIBS="-latom_types -llg-types -lstorage-types -lsexpr -lpersist-flow -Wl,--no-as-needed -lpersist-rocks -lpersist-monospace -lpersist-cog -lpersist-cog-simple -lpersist-file -Wl,--as-needed -lpersist -latomspace -L/usr/local/lib/opencog/" |
| 519 | 519 | fi |
| 520 | 520 | AC_SUBST(ATOMSPACE_LIBS) |
| 521 | 521 | |