Mercurial > hg > release > icedtea7-2.0
changeset 2421:c644df7984ad
Make sure IT_LOCATE_NSS macro is called and include --enable-nss logic it depends on.
2011-05-23 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(IT_LOCATE_NSS): Add --enable-nss logic.
* configure.ac:
Move --enable-nss logic to IT_LOCATE_NSS macro.
Call IT_LOCATE_NSS macro.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 23 May 2011 15:48:03 +0100 |
| parents | 68119ec8f861 |
| children | 3024025d7759 |
| files | ChangeLog acinclude.m4 configure.ac |
| diffstat | 3 files changed, 22 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 23 14:08:37 2011 +0100 +++ b/ChangeLog Mon May 23 15:48:03 2011 +0100 @@ -1,3 +1,11 @@ +2011-05-23 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (IT_LOCATE_NSS): Add --enable-nss logic. + * configure.ac: + Move --enable-nss logic to IT_LOCATE_NSS macro. + Call IT_LOCATE_NSS macro. + 2011-05-22 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/acinclude.m4 Mon May 23 14:08:37 2011 +0100 +++ b/acinclude.m4 Mon May 23 15:48:03 2011 +0100 @@ -1686,6 +1686,18 @@ AC_DEFUN_ONCE([IT_LOCATE_NSS], [ AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR]) +AC_MSG_CHECKING([whether to enable the NSS-based security provider]) +AC_ARG_ENABLE([nss], + [AS_HELP_STRING([--enable-nss], + [Enable inclusion of NSS security provider])], + [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no']) +AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes]) +if test "x${ENABLE_NSS}" = "xyes" +then + AC_MSG_RESULT([enabled by default (edit java.security to disable)]) +else + AC_MSG_RESULT([disabled by default (edit java.security to enable)]) +fi PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no]) if test "x${NSS_FOUND}" = xno then @@ -1702,6 +1714,7 @@ AC_SUBST(NSS_LIBDIR) AC_CONFIG_FILES([nss.cfg]) ]) + AC_DEFUN([IT_DIAMOND_CHECK],[ AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [ CLASS=Test.java
--- a/configure.ac Mon May 23 14:08:37 2011 +0100 +++ b/configure.ac Mon May 23 15:48:03 2011 +0100 @@ -83,19 +83,7 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) -AC_MSG_CHECKING([whether to include the NSS-based security provider]) -AC_ARG_ENABLE([nss], - [AS_HELP_STRING([--enable-nss], - [Enable inclusion of NSS security provider])], - [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no']) -AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes]) -if test "x${ENABLE_NSS}" = "xyes" -then - AC_MSG_RESULT([enabled by default (edit java.security to disable)]) -else - AC_MSG_RESULT([disabled by default (edit java.security to enable)]) -fi - +IT_LOCATE_NSS IT_GET_PKGVERSION IT_GET_LSB_DATA