Revision to 0.4.0
Libtool: 1:0:0 Java is not activated when no jar program.
This commit is contained in:
parent
7f96eb8e68
commit
d150d244c2
14
configure.ac
14
configure.ac
|
@ -15,7 +15,7 @@ dnl - Second number is the number of supported API versions where API version >
|
|||
dnl first number.
|
||||
dnl - Third number is the current API version implementation version number.
|
||||
dnl See libtool explanations about current, age and release, later in this file.
|
||||
AC_INIT([Liberty Alliance Single Sign On], 0.3.0, lasso-devel@lists.labs.libre-entreprise.org)
|
||||
AC_INIT([Liberty Alliance Single Sign On], 0.4.0, lasso-devel@lists.labs.libre-entreprise.org)
|
||||
dnl Check if autoconf ver > 2.53
|
||||
AC_PREREQ(2.53)
|
||||
dnl Check existence of a relative pathed source file.
|
||||
|
@ -24,7 +24,7 @@ dnl Copy stamp REVISIO-INFO in the configure script.
|
|||
AC_REVISION($Revision$)
|
||||
|
||||
dnl Run many macros mostly needed by configure.ac.
|
||||
AM_INIT_AUTOMAKE(lasso, 0.3.0)
|
||||
AM_INIT_AUTOMAKE(lasso, 0.4.0)
|
||||
dnl Create rules to automaticaly regenerate the config header.
|
||||
AM_CONFIG_HEADER(lasso/lasso_config.h)
|
||||
dnl Add --enable-maintainer-mode option to configure.
|
||||
|
@ -151,7 +151,7 @@ dnl - interfaces removed -> AGE = 0
|
|||
# m = a
|
||||
# r = r
|
||||
current=`expr $VERSION_MAJOR + $VERSION_MINOR`
|
||||
LASSO_VERSION_INFO="$current:$VERSION_RELEASE:$VERSION_MINOR"
|
||||
LASSO_VERSION_INFO="1:0:0"
|
||||
AC_SUBST(LASSO_VERSION_INFO)
|
||||
|
||||
dnl ==========================================================================
|
||||
|
@ -258,9 +258,11 @@ fi
|
|||
|
||||
dnl If we found a java version information, we have java compilation environment.
|
||||
if test "X$JAVA_VERSION" != X; then
|
||||
languages_available="$languages_available $JAVA($JAVA_VERSION)"
|
||||
else
|
||||
enable_java=no
|
||||
if test "X$JAR" != X; then
|
||||
languages_available="$languages_available $JAVA($JAVA_VERSION)"
|
||||
else
|
||||
enable_java=no
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Conditional java sub dir test.
|
||||
|
|
Loading…
Reference in New Issue