logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

db-4.6-jni-check-prefix-first.patch (1104B)

    

  1. --- a/dist/aclocal_java/ac_jni_include_dirs.m4

  2. +++ b/dist/aclocal_java/ac_jni_include_dirs.m4

  3. @@ -43,14 +43,19 @@

  4.  *)	AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;

  5.  esac

  6.  

  7. -_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")

  8. -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`

  9. -case "$host_os" in

  10. -	darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`

  11. -			_JINC="$_JTOPDIR/Headers";;

  12. -	*)		_JINC="$_JTOPDIR/include";;

  13. -esac

  14. -

  15. +# If JAVAPREFIX is defined, look there first

  16. +if test -r "$JAVAPREFIX/include/jni.h"; then

  17. +	_JTOPDIR="$JAVAPREFIX"

  18. +	_JINC="$JAVAPREFIX/include"

  19. +else

  20. +	_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")

  21. +	_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`

  22. +	case "$host_os" in

  23. +		darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`

  24. +				_JINC="$_JTOPDIR/Headers";;

  25. +		*)		_JINC="$_JTOPDIR/include";;

  26. +	esac

  27. +fi

  28.  # If we find jni.h in /usr/include, then it's not a java-only tree, so

  29.  # don't add /usr/include or subdirectories to the list of includes.

  30.  # An extra -I/usr/include can foul things up with newer gcc's.