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

Diff of /classpath/acinclude.m4

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

revision 1.42.2.1 by gnu_andrew, Sun Jan 16 02:14:45 2005 UTC revision 1.42.2.2 by gnu_andrew, Sun Jan 16 15:14:52 2005 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 135  AC_DEFUN([CLASSPATH_CHECK_JIKES], Line 138  AC_DEFUN([CLASSPATH_CHECK_JIKES],
138    else    else
139      AC_PATH_PROG(JIKES, "jikes")      AC_PATH_PROG(JIKES, "jikes")
140    fi    fi
141      if test "x$JIKES" != "x"; then
142        dnl Require at least version 1.19
143        AC_MSG_CHECKING(jikes version)
144        JIKES_VERSION=`$JIKES --version | awk '/^Jikes Compiler/' | cut -d ' ' -f 5`
145        JIKES_VERSION_MAJOR=`echo "$JIKES_VERSION" | cut -d '.' -f 1`
146        JIKES_VERSION_MINOR=`echo "$JIKES_VERSION" | cut -d '.' -f 2`
147        if expr "$JIKES_VERSION_MAJOR" == 1 > /dev/null; then
148          if expr "$JIKES_VERSION_MINOR" \< 19 > /dev/null; then
149            JIKES=""
150          fi
151        fi
152        if test "x$JIKES" != "x"; then
153          AC_MSG_RESULT($JIKES_VERSION)
154        else
155          AC_MSG_WARN($JIKES_VERSION: jikes 1.19 or higher required)
156        fi
157      fi
158  ])  ])
159    
160  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
# Line 173  AC_DEFUN([CLASSPATH_CHECK_KJC], Line 193  AC_DEFUN([CLASSPATH_CHECK_KJC],
193  ])  ])
194    
195  dnl -----------------------------------------------------------  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 -----------------------------------------------------------
231  AC_DEFUN([CLASSPATH_WITH_JAVAH],  AC_DEFUN([CLASSPATH_WITH_JAVAH],
232  [  [
233    AC_ARG_WITH([javah],    AC_ARG_WITH([javah],
# Line 291  AC_DEFUN([CLASSPATH_WITH_GLIBJ], Line 346  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
346  ])  ])
347    
348  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
349  dnl Enable generation of API documentation, assumes gjdoc  dnl Enable generation of API documentation, with gjdoc if it
350  dnl has been compiled to an executable or a suitable script  dnl has been compiled to an executable (or a suitable script
351  dnl is in your PATH  dnl is in your PATH) or using the argument as gjdoc executable.
352  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
353  AC_DEFUN([CLASSPATH_ENABLE_GJDOC],  AC_DEFUN([CLASSPATH_WITH_GJDOC],
354  [  [
355    AC_ARG_ENABLE([gjdoc],    AC_ARG_WITH([gjdoc],
356                  [AS_HELP_STRING([--enable-gjdoc],[enable API doc. generation [default=no]])],                AS_HELP_STRING([--with-gjdoc],
357                  [                               [generate documentation using gjdoc (default is NO)]),
358                    case "${enableval}" in                [if test "x${withval}" = xno; then
359                      yes) ENABLE_GJDOC=yes ;;                   WITH_GJDOC=no;
360                      no) ENABLE_GJDOC=no ;;                 elif test "x${withval}" = xyes -o "x{withval}" = x; then
361                      *) ENABLE_GJDOC=yes ;;                   WITH_GJDOC=yes;
362                    esac                   AC_PATH_PROG(GJDOC, gjdoc, "no")
363                    if test "x${ENABLE_GJDOC}" = xyes; then                   if test "x${GJDOC}" = xno; then
364                      AC_PATH_PROG(GJDOC, gjdoc)                     AC_MSG_ERROR("gjdoc executable not found");
365                      AC_PATH_PROG(XMLCATALOG, xmlcatalog)                   fi
366                      AC_PATH_PROG(XSLTPROC, xsltproc)                 else
367                    fi                   WITH_GJDOC=yes
368                  ],                   GJDOC="${withval}"
369                  [ENABLE_GJDOC=no])                   AC_CHECK_FILE(${GJDOC}, AC_SUBST(GJDOC),
370                                   AC_MSG_ERROR("Cannot use ${withval} as gjdoc executable since it doesn't exist"))
371    AM_CONDITIONAL(CREATE_API_DOCS, test "x${ENABLE_GJDOC}" = xyes)                 fi],
372                  [WITH_GJDOC=no])
373    
374      AM_CONDITIONAL(CREATE_API_DOCS, test "x${WITH_GJDOC}" = xyes)
375  ])  ])
376    
377    dnl -----------------------------------------------------------
378    dnl Enable regeneration of parsers using jay
379    dnl http://www.informatik.uni-osnabrueck.de/alumni/bernd/jay/
380    dnl -----------------------------------------------------------
381    AC_DEFUN([REGEN_WITH_JAY],
382    [
383      AC_ARG_WITH([jay],
384                  [AS_HELP_STRING(--with-jay,Regenerate the parsers with jay must be given the path to the jay executable)],
385      [
386        if test -d "${withval}"; then
387          JAY_DIR_PATH="${withval}"
388          AC_PATH_PROG(JAY, jay, "no", ${JAY_DIR_PATH})
389          if test "x${JAY}" = xno; then
390            AC_MSG_ERROR("jay executable not found");
391          fi
392        else
393          JAY_DIR_PATH=$(dirname "${withval}")
394          JAY="${withval}"
395          AC_SUBST(JAY)
396        fi
397        JAY_SKELETON="${JAY_DIR_PATH}/skeleton"
398        AC_CHECK_FILE(${JAY_SKELETON}, AC_SUBST(JAY_SKELETON),
399            AC_MSG_ERROR("Expected skeleton file in $(dirname ${withval})"))
400        JAY_FOUND=yes
401      ],
402      [
403        JAY_FOUND=no
404      ])
405      AM_CONDITIONAL(REGEN_PARSERS, test "x${JAY_FOUND}" = xyes)
406    ])

Legend:
Removed from v.1.42.2.1  
changed lines
  Added in v.1.42.2.2

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