/[cashew-s-editor]/cashews/acinclude.m4
ViewVC logotype

Diff of /cashews/acinclude.m4

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

revision 1.1.1.1 by gnu_andrew, Mon Jan 31 04:02:18 2005 UTC revision 1.2 by gnu_andrew, Tue Feb 1 01:01:08 2005 UTC
# Line 10  AC_DEFUN([CLASSPATH_FIND_JAVAC], Line 10  AC_DEFUN([CLASSPATH_FIND_JAVAC],
10    CLASSPATH_WITH_JIKES    CLASSPATH_WITH_JIKES
11    CLASSPATH_WITH_KJC    CLASSPATH_WITH_KJC
12    CLASSPATH_WITH_GCJX    CLASSPATH_WITH_GCJX
13      CLASSPATH_WITH_ECJ
14    
15    if test "x${user_specified_javac}" = x; then    if test "x${user_specified_javac}" = x; then
16      AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)      AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)
17      AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x)      AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x)
18        AM_CONDITIONAL(FOUND_ECJ, test "x${ECJ}" != x)
19    else    else
20      AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj)      AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj)
21      AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)      AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)
22        AM_CONDITIONAL(FOUND_ECJ, test "x${user_specified_javac}" = xecj)
23    fi    fi
24    AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)    AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
25    AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx)    AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx)
26    
27    if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx; then    if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx; then
28        # FIXME: use autoconf error function        # FIXME: use autoconf error function
29        echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, or --with-gcjx" 1>&2        echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj or --with-gcjx" 1>&2
30        exit 1            exit 1    
31    fi    fi
32  ])  ])
# Line 310  AC_DEFUN([CLASSPATH_WITH_GLIBJ], Line 313  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
313                [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none) [default=zip]])],                [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none) [default=zip]])],
314                [                [
315                  if test "x${withval}" = xyes || test "x${withval}" = xzip; then                  if test "x${withval}" = xyes || test "x${withval}" = xzip; then
316                    AC_PATH_PROG(ZIP, zip)                    AC_PATH_PROG(JAR, jar)
317                    install_class_files=no                    install_class_files=no
318                  elif test "x${withval}" = xboth; then                  elif test "x${withval}" = xboth; then
319                    AC_PATH_PROG(ZIP, zip)                    AC_PATH_PROG(JAR, jar)
320                    install_class_files=yes                    install_class_files=yes
321                  elif test "x${withval}" = xflat; then                  elif test "x${withval}" = xflat; then
322                    ZIP=                    JAR=
323                    install_class_files=yes                    install_class_files=yes
324                  elif test "x${withval}" = xno || test "x${withval}" = xnone; then                  elif test "x${withval}" = xno || test "x${withval}" = xnone; then
325                    ZIP=                    JAR=
326                    install_class_files=no                    install_class_files=no
327                  else                  else
328                    AC_MSG_ERROR([unknown value given to --with-glibj])                    AC_MSG_ERROR([unknown value given to --with-glibj])
329                  fi                  fi
330                ],                ],
331                [                [
332                  AC_PATH_PROG(ZIP, zip)                  AC_PATH_PROG(JAR, jar)
333                  install_class_files=no                  install_class_files=no
334                ])                ])
335    AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)    AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${JAR}" != x)
336    AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)    AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)
337    
338    AC_ARG_ENABLE([examples],    AC_ARG_ENABLE([examples],
# Line 340  AC_DEFUN([CLASSPATH_WITH_GLIBJ], Line 343  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
343                    *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;;                    *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;;
344                  esac],                  esac],
345                  [EXAMPLESDIR="examples"])                  [EXAMPLESDIR="examples"])
346    if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then    if test "x${JAR}" = x && test "x${install_class_files}" = xno; then
347      EXAMPLESDIR=""      EXAMPLESDIR=""
348    fi    fi
349    AC_SUBST(EXAMPLESDIR)    AC_SUBST(EXAMPLESDIR)
# Line 375  AC_DEFUN([CLASSPATH_WITH_GJDOC], Line 378  AC_DEFUN([CLASSPATH_WITH_GJDOC],
378    AM_CONDITIONAL(CREATE_API_DOCS, test "x${WITH_GJDOC}" = xyes)    AM_CONDITIONAL(CREATE_API_DOCS, test "x${WITH_GJDOC}" = xyes)
379  ])  ])
380    
381    dnl -----------------------------------------------------------
382    AC_DEFUN([CLASSPATH_WITH_ECJ],
383    [
384      AC_ARG_WITH([ecj],
385                  [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
386      [
387        if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
388          CLASSPATH_CHECK_ECJ(${withval})
389        else
390          if test "x${withval}" != xno; then
391            CLASSPATH_CHECK_ECJ
392          fi
393        fi
394        user_specified_javac=ecj
395      ],
396      [
397        CLASSPATH_CHECK_ECJ
398      ])
399      AC_SUBST(ECJ)
400    ])
401    
402    dnl -----------------------------------------------------------
403    AC_DEFUN([CLASSPATH_CHECK_ECJ],
404    [
405      if test "x$1" != x; then
406        if test -f "$1"; then
407          ECJ="$1"
408        else
409          AC_PATH_PROG(ECJ, "$1")
410        fi
411      else
412        AC_PATH_PROG(ECJ, "ecj")
413      fi
414    ])

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.2

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