diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 02:02:43 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 02:02:43 +0200 |
| commit | 31c682c4ee96d889dff46261b2ce4d6a6800c8e3 (patch) | |
| tree | bcc6893f9f37c8d14a5c22f14af8705e161cc38e | |
| parent | ac30eb2c1e452df5c4e4992038b24b26cfcd5ced (diff) | |
| download | pacman-31c682c4ee96d889dff46261b2ce4d6a6800c8e3.tar.gz pacman-31c682c4ee96d889dff46261b2ce4d6a6800c8e3.tar.xz | |
configure changes for java detection (require swig)
by Christian Hamar alias krix <krics@linuxforum.hu>
| -rw-r--r-- | configure.ac | 36 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
2 files changed, 26 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index acf8656c..26cf1be0 100644 --- a/configure.ac +++ b/configure.ac @@ -297,17 +297,31 @@ fi dnl Check for java support AC_MSG_CHECKING(if Java bindings should be generated) if test x$wantjava = xyes ; then - AC_CHECK_PROGS([JAVAC], [javac]) - AM_CONDITIONAL(HAS_JAVA, test $JAVAC) - if test $JAVAC ; then - AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support]) - AC_MSG_RESULT(yes) - JAVASTATUS="yes, path: `which $JAVAC`" - else - AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support]) - AC_MSG_RESULT(no, javac missing) - JAVASTATUS="java compiler not found" - fi + AC_CHECK_PROGS([SWIG], [swig]) + AC_CHECK_PROGS([JAVAC], [javac]) + AM_CONDITIONAL(HAS_JAVA, test $SWIG) + AM_CONDITIONAL(HAS_JAVA, test $JAVAC) + if test $JAVAC ; then + if test $SWIG ; then + AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support (javac=ok swig=ok)]) + AC_MSG_RESULT(yes) + JAVASTATUS="yes, path: `which $JAVAC`" + else + AC_DEFINE([HAS_JAVA], [FALSE], [Java support disabled because swig not found (javac=ok swig=missing)]) + AC_MSG_RESULT(no, swig not found and that is need for java) + JAVASTATUS="java compiler found, swig not found" + fi + else + if test $SWIG ; then + AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support (javac=missing swig=ok]) + AC_MSG_RESULT(no, javac missing, swig ok) + JAVASTATUS="java compiler not found, swig found" + else + AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support (javac=missing swig=missing]) + AC_MSG_RESULT(no, javac missing, swig missing) + JAVASTATUS="java compiler not found, swig not found" + fi + fi else AM_CONDITIONAL(HAS_JAVA, test $JAVAC) AC_DEFINE([HAS_JAVA], [FALSE], [Not specified at configure line]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 9adb025e..78f0788b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -20,7 +20,7 @@ pacman.8: endif clean: - rm -f html/* + rm -f html/*.html rm -f hu/*.8 rm -f man3/*.3 |