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

Diff of /classpath/m4/acinclude.m4

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

revision 1.1 by tromey, Tue Apr 26 22:44:03 2005 UTC revision 1.2 by tromey, Tue Jun 14 21:22:36 2005 UTC
# Line 301  AC_DEFUN([CLASSPATH_WITH_CLASSLIB], Line 301  AC_DEFUN([CLASSPATH_WITH_CLASSLIB],
301    ],    ],
302    [ conditional_with_classlib=false ])    [ conditional_with_classlib=false ])
303    AM_CONDITIONAL(USER_SPECIFIED_CLASSLIB, test "x${conditional_with_classlib}" = xtrue)    AM_CONDITIONAL(USER_SPECIFIED_CLASSLIB, test "x${conditional_with_classlib}" = xtrue)
304    
305      AC_ARG_WITH([vm-classes],
306                  [AS_HELP_STRING(--with-vm-classes,specify path to VM override source files)], [vm_classes="$with_vm_classes"],
307                  [vm_classes="${top_srcdir}/vm/reference"])
308      AC_SUBST(vm_classes)
309  ])  ])
310    
311  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
# Line 309  dnl ------------------------------------ Line 314  dnl ------------------------------------
314  AC_DEFUN([CLASSPATH_WITH_GLIBJ],  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
315  [  [
316    AC_ARG_WITH([glibj],    AC_ARG_WITH([glibj],
317                [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|build) [default=zip]])],
318                [                [
319                  if test "x${withval}" = xyes || test "x${withval}" = xzip; then                  if test "x${withval}" = xyes || test "x${withval}" = xzip; then
320                    AC_PATH_PROG(ZIP, zip)                    AC_PATH_PROG(ZIP, zip)
321                    install_class_files=no                    install_class_files=no
322                      build_class_files=yes
323                  elif test "x${withval}" = xboth; then                  elif test "x${withval}" = xboth; then
324                    AC_PATH_PROG(ZIP, zip)                    AC_PATH_PROG(ZIP, zip)
325                    install_class_files=yes                    install_class_files=yes
326                      build_class_files=yes
327                  elif test "x${withval}" = xflat; then                  elif test "x${withval}" = xflat; then
328                    ZIP=                    ZIP=
329                    install_class_files=yes                    install_class_files=yes
330                      build_class_files=yes
331                  elif test "x${withval}" = xno || test "x${withval}" = xnone; then                  elif test "x${withval}" = xno || test "x${withval}" = xnone; then
332                    ZIP=                    ZIP=
333                    install_class_files=no                    install_class_files=no
334                      build_class_files=no
335                    elif test "x${withval}" = xbuild; then
336                      ZIP=
337                      install_class_files=no
338                      build_class_files=yes
339                  else                  else
340                    AC_MSG_ERROR([unknown value given to --with-glibj])                    AC_MSG_ERROR([unknown value given to --with-glibj])
341                  fi                  fi
# Line 333  AC_DEFUN([CLASSPATH_WITH_GLIBJ], Line 346  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
346                ])                ])
347    AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)    AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)
348    AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)    AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)
349      AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes)
350    
351    AC_ARG_ENABLE([examples],    AC_ARG_ENABLE([examples],
352                  [AS_HELP_STRING(--enable-examples,enable build of the examples [default=yes])],                  [AS_HELP_STRING(--enable-examples,enable build of the examples [default=yes])],

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

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