[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm-5_4: rpm/ acinclude.m4
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2016-05-11 18:50:09
Message-ID: 20160511185009.05E316488D () rpm5 ! org
[Download RAW message or body]
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 11-May-2016 20:50:08
Branch: rpm-5_4 Handle: 2016051118500800
Modified files: (Branch: rpm-5_4)
rpm acinclude.m4
Log:
- update java detection AutoFU.
Summary:
Revision Changes Path
2.31.2.6 +21 -16 rpm/acinclude.m4
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
============================================================================
$ cvs diff -u -r2.31.2.5 -r2.31.2.6 acinclude.m4
--- rpm/acinclude.m4 19 Apr 2016 12:49:48 -0000 2.31.2.5
+++ rpm/acinclude.m4 11 May 2016 18:50:08 -0000 2.31.2.6
@@ -848,7 +848,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_CLASS],[
AC_REQUIRE([AC_PROG_JAVA])
@@ -954,7 +954,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_CLASSPATH],[
if test "x$CLASSPATH" = x; then
@@ -997,7 +997,7 @@
dnl chmod +x $@
dnl
dnl @author Luc Maisonobe
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_JUNIT],[
AC_CACHE_VAL(ac_cv_prog_JUNIT,[
@@ -1037,7 +1037,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_RQRD_CLASS],[
@@ -1063,7 +1063,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <ktohg@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_JAVA_OPTIONS],[
AC_ARG_WITH(java-prefix,
@@ -1113,7 +1113,7 @@
dnl This particular macro is not part of the original set of macros.
dnl
dnl @author Don Anderson
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_JNI_INCLUDE_DIR],[
@@ -1132,7 +1132,11 @@
_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
case "$host_os" in
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
- _JINC="$_JTOPDIR/Headers";;
+ if test -d "$_JTOPDIR/include"; then
+ _JINC="$_JTOPDIR/include"
+ else
+ _JINC="$_JTOPDIR/Headers"
+ fi;;
*) _JINC="$_JTOPDIR/include";;
esac
@@ -1161,6 +1165,7 @@
aix*) _JNI_INC_SUBDIRS="aix";;
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
cygwin*) _JNI_INC_SUBDIRS="win32";;
+ darwin*) _JNI_INC_SUBDIRS="darwin";;
freebsd*) _JNI_INC_SUBDIRS="freebsd";;
hp*) _JNI_INC_SUBDIRS="hp-ux";;
linux*) _JNI_INC_SUBDIRS="linux genunix";;
@@ -1224,7 +1229,7 @@
dnl configure.in, is included in the AC_PROG_JAVA macro.
dnl
dnl @author Egon Willighagen <egonw@sci.kun.nl>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAR],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1268,7 +1273,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAC],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1296,7 +1301,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAC_WORKS],[
AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
@@ -1344,7 +1349,7 @@
dnl configure.in, is included in the AC_PROG_JAVA macro.
dnl
dnl @author Egon Willighagen <egonw@sci.kun.nl>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVADOC],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1366,7 +1371,7 @@
dnl the full path of javah and CPPFLAGS is updated accordingly.
dnl
dnl @author Luc Maisonobe
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAH],[
AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
@@ -1451,7 +1456,7 @@
dnl AC_OUTPUT(Makefile)
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
dnl Note: Modified to prefer java over kaffe. [#8059]
dnl
@@ -1481,7 +1486,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVA_WORKS], [
AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes)
@@ -1583,7 +1588,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <ktohg@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_TRY_COMPILE_JAVA],[
AC_REQUIRE([AC_PROG_JAVAC])dnl
@@ -1624,7 +1629,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <ktohg@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.5 2016/04/19 12:49:48 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.6 2016/05/11 18:50:08 jbj Exp $
dnl
AC_DEFUN([AC_TRY_RUN_JAVA],[
AC_REQUIRE([AC_PROG_JAVAC])dnl
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic