/[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.2.2 by gnu_andrew, Tue Aug 2 20:12:39 2005 UTC revision 1.1.2.3 by gnu_andrew, Sat Sep 10 15:31:58 2005 UTC
# Line 319  dnl CLASSPATH_WITH_GLIBJ - specify what Line 319  dnl CLASSPATH_WITH_GLIBJ - specify what
319  dnl -----------------------------------------------------------  dnl -----------------------------------------------------------
320  AC_DEFUN([CLASSPATH_WITH_GLIBJ],  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
321  [  [
322      AC_PATH_PROG(ZIP, zip)
323    AC_ARG_WITH([glibj],    AC_ARG_WITH([glibj],
324                [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])],                [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])],
325                [                [
326                  if test "x${withval}" = xyes || test "x${withval}" = xzip; then                  if test "x${withval}" = xyes || test "x${withval}" = xzip; then
                   AC_PATH_PROG(ZIP, zip)  
327                    install_class_files=no                    install_class_files=no
328                    build_class_files=yes                    build_class_files=yes
329                      use_zip=yes
330                  elif test "x${withval}" = xboth; then                  elif test "x${withval}" = xboth; then
                   AC_PATH_PROG(ZIP, zip)  
331                    install_class_files=yes                    install_class_files=yes
332                    build_class_files=yes                    build_class_files=yes
333                      use_zip=yes
334                  elif test "x${withval}" = xflat; then                  elif test "x${withval}" = xflat; then
                   ZIP=  
335                    install_class_files=yes                    install_class_files=yes
336                    build_class_files=yes                    build_class_files=yes
337                      use_zip=no
338                  elif test "x${withval}" = xno || test "x${withval}" = xnone; then                  elif test "x${withval}" = xno || test "x${withval}" = xnone; then
                   ZIP=  
339                    install_class_files=no                    install_class_files=no
340                    build_class_files=no                    build_class_files=no
341                      use_zip=no
342                  elif test "x${withval}" = xbuild; then                  elif test "x${withval}" = xbuild; then
                   ZIP=  
343                    install_class_files=no                    install_class_files=no
344                    build_class_files=yes                    build_class_files=yes
345                      use_zip=no
346                  else                  else
347                    AC_MSG_ERROR([unknown value given to --with-glibj])                    AC_MSG_ERROR([unknown value given to --with-glibj])
348                  fi                  fi
349                ],                ],
350                [                [
                 AC_PATH_PROG(ZIP, zip)  
351                  install_class_files=no                  install_class_files=no
352                    use_zip=yes
353                ])                ])
354    AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)    AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${use_zip}" = xyes)
355    AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)    AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)
356    AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes)    AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes)
357    
# Line 362  AC_DEFUN([CLASSPATH_WITH_GLIBJ], Line 363  AC_DEFUN([CLASSPATH_WITH_GLIBJ],
363                    *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;;                    *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;;
364                  esac],                  esac],
365                  [EXAMPLESDIR="examples"])                  [EXAMPLESDIR="examples"])
366    if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then    if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then
367      EXAMPLESDIR=""      EXAMPLESDIR=""
368    fi    fi
369    AC_SUBST(EXAMPLESDIR)    AC_SUBST(EXAMPLESDIR)

Legend:
Removed from v.1.1.2.2  
changed lines
  Added in v.1.1.2.3

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