configure.ac (271f99ac) configure.ac (37cc8903)
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

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

658AC_ARG_ENABLE(gcjaot,
659[ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
660 support to speed up buildsi by compiling the jars also
661 to native code..
662 --enable-gcjaot is only known to work with bytecode
663 created with gcj or ecj
664],,)
665AC_ARG_WITH(ant-home,
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

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

658AC_ARG_ENABLE(gcjaot,
659[ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
660 support to speed up buildsi by compiling the jars also
661 to native code..
662 --enable-gcjaot is only known to work with bytecode
663 created with gcj or ecj
664],,)
665AC_ARG_WITH(ant-home,
666[ --with-ant-home If you have installed Jakarta Ant on your system,
666[ --with-ant-home If you have installed Apache Ant on your system,
667 please supply the path here.
668 Note that this is not the location of the Ant binary
669 but the location of the entire distribution.
670
671 Usage: --with-ant-home=<absolute path to Ant home>
672],,)
673AC_ARG_WITH(junit,
674[ --with-junit Specifies the JUnit 4 jar file to use for JUnit-based

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

6976
6977if test "$SOLAR_JAVA" != ""; then
6978ANT_HOME=; export ANT_HOME
6979WITH_ANT_HOME=; export WITH_ANT_HOME
6980if test -z "$with_ant_home"; then
6981 if test "$_os" = "OS2"; then
6982 AC_PATH_PROGS(ANT, ant.cmd)
6983 else
667 please supply the path here.
668 Note that this is not the location of the Ant binary
669 but the location of the entire distribution.
670
671 Usage: --with-ant-home=<absolute path to Ant home>
672],,)
673AC_ARG_WITH(junit,
674[ --with-junit Specifies the JUnit 4 jar file to use for JUnit-based

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

6976
6977if test "$SOLAR_JAVA" != ""; then
6978ANT_HOME=; export ANT_HOME
6979WITH_ANT_HOME=; export WITH_ANT_HOME
6980if test -z "$with_ant_home"; then
6981 if test "$_os" = "OS2"; then
6982 AC_PATH_PROGS(ANT, ant.cmd)
6983 else
6984 AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
6984 AC_PATH_PROGS(ANT, [apache-ant ant ant.sh ant.bat ant.cmd])
6985 fi
6986else
6987 if test "$_os" = "WINNT"; then
6988 with_ant_home=`cygpath -u "$with_ant_home"`
6989 fi
6990 if test "$_os" = "OS2"; then
6991 AC_PATH_PROGS(ANT, ant.cmd,,$with_ant_home/bin:$PATH)
6992 else
6985 fi
6986else
6987 if test "$_os" = "WINNT"; then
6988 with_ant_home=`cygpath -u "$with_ant_home"`
6989 fi
6990 if test "$_os" = "OS2"; then
6991 AC_PATH_PROGS(ANT, ant.cmd,,$with_ant_home/bin:$PATH)
6992 else
6993 AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
6993 AC_PATH_PROGS(ANT, [apache-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
6994 fi
6995 WITH_ANT_HOME=$with_ant_home
6996 ANT_HOME=$with_ant_home
6997fi
6998
6999if test -z "$ANT"; then
7000 AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
7001else

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

7094 fi
7095 fi
7096 fi
7097 AC_MSG_RESULT([Ant lib directory found.])
7098fi
7099AC_SUBST(ANT_LIB)
7100fi
7101
6994 fi
6995 WITH_ANT_HOME=$with_ant_home
6996 ANT_HOME=$with_ant_home
6997fi
6998
6999if test -z "$ANT"; then
7000 AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
7001else

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

7094 fi
7095 fi
7096 fi
7097 AC_MSG_RESULT([Ant lib directory found.])
7098fi
7099AC_SUBST(ANT_LIB)
7100fi
7101
7102ant_minver=1.6.0
7102ant_minver=1.9.1
7103# update for more extensions...
7104if test "$ENABLE_MEDIAWIKI" = "YES"; then
7103# update for more extensions...
7104if test "$ENABLE_MEDIAWIKI" = "YES"; then
7105 ant_minver=1.7.0
7105 ant_minver=1.9.1
7106fi
7107ant_minminor1=`echo $ant_minver | cut -d"." -f2`
7108
7109AC_MSG_CHECKING([whether ant is >= $ant_minver])
7110ant_version=`$ANT -version | $AWK '{ print $4; }'`
7111ant_version_major=`echo $ant_version | cut -d. -f1`
7112ant_version_minor=`echo $ant_version | cut -d. -f2`
7113echo "configure: ant_version $ant_version " >&5

--- 321 unchanged lines hidden --- 		7106fi
7107ant_minminor1=`echo $ant_minver | cut -d"." -f2`
7108
7109AC_MSG_CHECKING([whether ant is >= $ant_minver])
7110ant_version=`$ANT -version | $AWK '{ print $4; }'`
7111ant_version_major=`echo $ant_version | cut -d. -f1`
7112ant_version_minor=`echo $ant_version | cut -d. -f2`
7113echo "configure: ant_version $ant_version " >&5

--- 321 unchanged lines hidden ---