|
Lines 745-759
Link Here
|
| 745 |
AC_MSG_CHECKING($1) |
745 |
AC_MSG_CHECKING($1) |
| 746 |
found_jar=no |
746 |
found_jar=no |
| 747 |
saved_ac_java_classpath=$ac_java_classpath |
747 |
saved_ac_java_classpath=$ac_java_classpath |
| 748 |
DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" |
748 |
# DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" |
| 749 |
for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
749 |
# for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
| 750 |
for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do |
750 |
# for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do |
| 751 |
# jar=`echo $jar|sed -e 's/ /\\ /'` |
751 |
# jar=`echo $jar|sed -e 's/ /\\ /'` |
| 752 |
# echo "protected $jar" |
752 |
# echo "protected $jar" |
| 753 |
# jar_resolved=`ls $jar 2>/dev/null` |
753 |
# jar_resolved=`ls $jar 2>/dev/null` |
| 754 |
# echo "looking for $jar_resolved" |
754 |
# echo "looking for $jar_resolved" |
| 755 |
# TODO check the behaviour when spaces |
755 |
# TODO check the behaviour when spaces |
| 756 |
jar_resolved=`ls $jar 2>/dev/null` |
756 |
jar_resolved=$1 |
| 757 |
if test -e "$jar_resolved"; then |
757 |
if test -e "$jar_resolved"; then |
| 758 |
export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
758 |
export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
| 759 |
AC_JAVA_TRY_COMPILE([import $2;], , [ |
759 |
AC_JAVA_TRY_COMPILE([import $2;], , [ |
|
Lines 766-776
Link Here
|
| 766 |
|
766 |
|
| 767 |
]) |
767 |
]) |
| 768 |
fi |
768 |
fi |
| 769 |
done |
769 |
# done |
| 770 |
if test "$found_jar" = "yes"; then |
770 |
if test "$found_jar" = "yes"; then |
| 771 |
break |
771 |
break |
| 772 |
fi |
772 |
fi |
| 773 |
done |
773 |
# done |
| 774 |
if test "$found_jar" = "no"; then |
774 |
if test "$found_jar" = "no"; then |
| 775 |
AC_MSG_RESULT([no]) |
775 |
AC_MSG_RESULT([no]) |
| 776 |
if test "$4" == "yes"; then |
776 |
if test "$4" == "yes"; then |
