/[classpath]/classpath/acinclude.m4
ViewVC logotype

Diff of /classpath/acinclude.m4

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.44 by dog, Tue Dec 21 14:33:32 2004 UTC revision 1.45 by tromey, Sat Dec 25 23:10:06 2004 UTC
# Line 8  AC_DEFUN([CLASSPATH_FIND_JAVAC], Line 8  AC_DEFUN([CLASSPATH_FIND_JAVAC],
8    CLASSPATH_WITH_GCJ    CLASSPATH_WITH_GCJ
9    CLASSPATH_WITH_JIKES    CLASSPATH_WITH_JIKES
10    CLASSPATH_WITH_KJC    CLASSPATH_WITH_KJC
11      CLASSPATH_WITH_GCJX
12    
13    if test "x${user_specified_javac}" = x; then    if test "x${user_specified_javac}" = x; then
14      AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)      AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)
# Line 17  AC_DEFUN([CLASSPATH_FIND_JAVAC], Line 18  AC_DEFUN([CLASSPATH_FIND_JAVAC],
18      AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)      AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)
19    fi    fi
20    AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)    AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
21      AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx)
22    
23    if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then    if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx; then
24        echo "configure: cannot find javac, try --with-gcj, --with-jikes, or --with-kjc" 1>&2        # FIXME: use autoconf error function
25          echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, or --with-gcjx" 1>&2
26        exit 1            exit 1    
27    fi    fi
28  ])  ])
# Line 189  AC_DEFUN([CLASSPATH_CHECK_KJC], Line 192  AC_DEFUN([CLASSPATH_CHECK_KJC],
192    fi    fi
193  ])  ])
194    
195    dnl -----------------------------------------------------------
196    AC_DEFUN([CLASSPATH_WITH_GCJX],
197    [
198      AC_ARG_WITH([gcjx],
199                  [AS_HELP_STRING(--with-gcjx,bytecode compilation with gcjx)],
200      [
201        if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
202          CLASSPATH_CHECK_GCJX(${withval})
203        else
204          if test "x${withval}" != xno; then
205            CLASSPATH_CHECK_GCJX
206          fi
207        fi
208        user_specified_javac=gcjx
209      ],
210      [
211        CLASSPATH_CHECK_GCJX
212      ])
213      AC_SUBST(GCJX)
214    ])
215    
216    dnl -----------------------------------------------------------
217    AC_DEFUN([CLASSPATH_CHECK_GCJX],
218    [
219      if test "x$1" != x; then
220        if test -f "$1"; then
221          GCJX="$1"
222        else
223          AC_PATH_PROG(GCJX, "$1")
224        fi
225      else
226        AC_PATH_PROG(GCJX, "gcjx")
227      fi
228    ])
229    
230  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
231  AC_DEFUN([CLASSPATH_WITH_JAVAH],  AC_DEFUN([CLASSPATH_WITH_JAVAH],
232  [  [

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26