Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10480
Modified Files:
svn-javahl.info
Log Message:
This should now build with both old and new javas.
Index: svn-javahl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/svn-javahl.info,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- svn-javahl.info 16 Oct 2010 01:17:30 -0000 1.41
+++ svn-javahl.info 22 Oct 2010 02:23:55 -0000 1.42
@@ -49,7 +49,6 @@
--with-apr-util=%p/bin/apu-1-config \
--without-apxs \
--disable-mod-activation \
-
--with-jdk=/System/Library/Frameworks/JavaVM.framework/Versions/%type_raw[java]/Home
\
--enable-javahl \
--with-jikes=no \
--without-swig \
@@ -71,20 +70,22 @@
export F77=no
export RUBY=/usr/bin/false
export PERL=/usr/bin/false
- ./configure %c
-
+ if [ -e /usr/libexec/java_home ]; then
+ ./configure %c --with-jdk=`/usr/libexec/java_home`
+ else
+ ./configure %c
--with-jdk=/System/Library/Frameworks/JavaVM.framework/Versions/%type_raw[java]/Home
+ fi
+
### Build javahl bindings
make javahl CPPFLAGS='-I$(top_srcdir)/subversion/include
-I$(top_builddir)/subversion -I%p/include/neon -I%p/include/apache2
-I%p/lib/system-openssl/include -I%p/include -DDARWIN
-DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
<<
-#InfoTest: <<
-# # There is one test failing because of permissions while running as root
-# TestDepends: junit
-# TestScript: <<
-# echo "There is one test failing because of permissions while running as
root."
-# make check-javahl || exit 1
-# <<
-# TestConfigureParams: --with-junit=%p/share/java/junit/junit.jar
-#<<
+InfoTest: <<
+ TestDepends: junit
+ TestScript: <<
+ make check-javahl || exit 1
+ <<
+ TestConfigureParams: --with-junit=%p/share/java/junit/junit.jar
+<<
# Install Phase:
DocFiles: <<
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
