View | Details | Raw Unified | Return to issue 12734
Collapse All | Expand All

(-)db-3.2.9.patch (-2 / +4 lines)
Lines 100-106 Link Here
100
  	*)		JINCSUBDIRS="genunix";;
100
  	*)		JINCSUBDIRS="genunix";;
101
  	esac
101
  	esac
102
  
102
  
103
--- 1786,1823 ----
103
--- 1786,1825 ----
104
  		echo "$ac_t""$JAVACABS" 1>&6
104
  		echo "$ac_t""$JAVACABS" 1>&6
105
  	done
105
  	done
106
  	JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
106
  	JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
Lines 111-117 Link Here
111
! 		darwin*)
111
! 		darwin*)
112
! 			JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'`
112
! 			JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'`
113
! 			echo "$JFRAMEDIR"
113
! 			echo "$JFRAMEDIR"
114
! 			if test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then
114
! 			if test -f "$JFRAMEDIR/Headers/jni.h"; then
115
! 				CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Headers"
116
! 			elif test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then
115
! 				CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Versions/1.3.1/Headers"
117
! 				CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Versions/1.3.1/Headers"
116
! 			else
118
! 			else
117
! 				{ echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; }
119
! 				{ echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; }

Return to issue 12734