configure.ac (4c76cf94) configure.ac (947c15fc)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 666 unchanged lines hidden (view full) ---

675],,)
676AC_ARG_WITH(junit,
677[ --with-junit Specifies the JUnit 4 jar file to use for JUnit-based
678 tests. --without-junit disables those tests. Not
679 relevant in the --without-java case.
680
681 Usage: --with-junit=<absolute path to JUnit 4 jar>
682],,with_junit=yes)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 666 unchanged lines hidden (view full) ---

675],,)
676AC_ARG_WITH(junit,
677[ --with-junit Specifies the JUnit 4 jar file to use for JUnit-based
678 tests. --without-junit disables those tests. Not
679 relevant in the --without-java case.
680
681 Usage: --with-junit=<absolute path to JUnit 4 jar>
682],,with_junit=yes)
683AC_ARG_WITH(hamcrest-core,
684[ --with-hamcrest-core Specifies the hamcrest-core jar file to use for
685 JUnit-based tests. --without-junit disables those
686 tests. Not relevant in the --without-java or
687 --without-junit cases, and only needed for recent
688 versions of JUnit. (Default: disabled.)
689],,with_hamcrest_core=no)
683AC_ARG_WITH(perl-home,
684[ --with-perl-home If you have installed the Perl 5 Distribution, on your
685 system, please supply the path here.
686 Note that this is not the location of the Perl binary
687 but the location of the entire distribution.
688
689 Usage: --with-perl-home=<absolute path to Perl 5 home>
690],,)

--- 6397 unchanged lines hidden (view full) ---

7088 AC_MSG_RESULT([no])
7089 AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default
7090location (/usr/share/java), specify its pathname via
7091--with-junit=..., or disable it via --without-junit])
7092 fi
7093fi
7094AC_SUBST(OOO_JUNIT_JAR)
7095
690AC_ARG_WITH(perl-home,
691[ --with-perl-home If you have installed the Perl 5 Distribution, on your
692 system, please supply the path here.
693 Note that this is not the location of the Perl binary
694 but the location of the entire distribution.
695
696 Usage: --with-perl-home=<absolute path to Perl 5 home>
697],,)

--- 6397 unchanged lines hidden (view full) ---

7095 AC_MSG_RESULT([no])
7096 AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default
7097location (/usr/share/java), specify its pathname via
7098--with-junit=..., or disable it via --without-junit])
7099 fi
7100fi
7101AC_SUBST(OOO_JUNIT_JAR)
7102
7103HAMCREST_CORE_JAR=
7104if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no" && test "$with_hamcrest_core" != "no"; then
7105 AC_MSG_CHECKING([for hamcrest-core])
7106 if test "$with_hamcrest_core" = "yes"; then
7107 if test -e /usr/share/java/hamcrest-core-1.3.jar; then
7108 HAMCREST_CORE_JAR=/usr/share/java/hamcrest-core-1.3.jar
7109 else
7110 if test -e /usr/share/lib/java/hamcrest-core.jar; then
7111 HAMCREST_CORE_JAR=/usr/share/lib/java/hamcrest-core.jar
7112 else
7113 HAMCREST_CORE_JAR=/usr/share/java/hamcrest-core.jar
7114 fi
7115 fi
7116 else
7117 HAMCREST_CORE_JAR=$with_hamcrest_core
7118 fi
7119 if test "$_os" = "WINNT"; then
7120 HAMCREST_CORE_JAR=`cygpath -m "$HAMCREST_CORE_JAR"`
7121 fi
7122 export HAMCREST_CORE_JAR
7123 "$JAVA_HOME/bin/jar" tf "$HAMCREST_CORE_JAR" 2>&5 | \
7124 $GREP org/hamcrest/core/AllOf.class > /dev/null 2>&5
7125 if test $? -eq 0; then
7126 else
7127 AC_MSG_ERROR([cannot find hamcrest-core jar; please install one in the
7128default location (/usr/share/java), specify its
7129pathname via --with-hamcrest-core=..., or disable
7130it via --without-hamcrest-core])
7131 fi
7132fi
7133AC_SUBST(HAMCREST_CORE_JAR)
7134
7096AC_MSG_CHECKING([which languages to be built])
7097WITH_LANG="$with_lang"
7098if test -z "$WITH_LANG"; then
7099 AC_MSG_RESULT([en-US])
7100else
7101 AC_MSG_RESULT([$WITH_LANG])
7102 ADDITIONAL_REPOSITORIES="$ADDITIONAL_REPOSITORIES ../extras"
7103 BUILD_TYPE="$BUILD_TYPE L10N"

--- 191 unchanged lines hidden --- 		7135AC_MSG_CHECKING([which languages to be built])
7136WITH_LANG="$with_lang"
7137if test -z "$WITH_LANG"; then
7138 AC_MSG_RESULT([en-US])
7139else
7140 AC_MSG_RESULT([$WITH_LANG])
7141 ADDITIONAL_REPOSITORIES="$ADDITIONAL_REPOSITORIES ../extras"
7142 BUILD_TYPE="$BUILD_TYPE L10N"

--- 191 unchanged lines hidden ---