From: Filippo Carone Date: Sun, 16 Mar 2008 13:12:06 +0000 (+0100) Subject: ac_prog_java* not needed anymore X-Git-Tag: 0.9.0-test0~2061 X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=7984e32f174df8fe061c0e9ec70aff32f6840f2a ac_prog_java* not needed anymore --- diff --git a/m4/Makefile.am b/m4/Makefile.am index 806b1d0ce2..af72a62dfd 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,12 +1,6 @@ NULL = EXTRA_DIST = \ - ac_prog_java.m4 \ - ac_prog_java_cc.m4 \ - ac_prog_java_works.m4 \ - ac_prog_javac.m4 \ - ac_prog_javac_works.m4 \ - ac_prog_javah.m4 \ codeset.m4 \ gettext.m4 \ glibc21.m4 \ diff --git a/m4/ac_prog_java.m4 b/m4/ac_prog_java.m4 deleted file mode 100644 index d16c2d6841..0000000000 --- a/m4/ac_prog_java.m4 +++ /dev/null @@ -1,83 +0,0 @@ -dnl @synopsis AC_PROG_JAVA -dnl -dnl Here is a summary of the main macros: -dnl -dnl AC_PROG_JAVAC: finds a Java compiler. -dnl -dnl AC_PROG_JAVA: finds a Java virtual machine. -dnl -dnl AC_CHECK_CLASS: finds if we have the given class (beware of -dnl CLASSPATH!). -dnl -dnl AC_CHECK_RQRD_CLASS: finds if we have the given class and stops -dnl otherwise. -dnl -dnl AC_TRY_COMPILE_JAVA: attempt to compile user given source. -dnl -dnl AC_TRY_RUN_JAVA: attempt to compile and run user given source. -dnl -dnl AC_JAVA_OPTIONS: adds Java configure options. -dnl -dnl AC_PROG_JAVA tests an existing Java virtual machine. It uses the -dnl environment variable JAVA then tests in sequence various common -dnl Java virtual machines. For political reasons, it starts with the -dnl free ones. You *must* call [AC_PROG_JAVAC] before. -dnl -dnl If you want to force a specific VM: -dnl -dnl - at the configure.in level, set JAVA=yourvm before calling -dnl AC_PROG_JAVA -dnl -dnl (but after AC_INIT) -dnl -dnl - at the configure level, setenv JAVA -dnl -dnl You can use the JAVA variable in your Makefile.in, with @JAVA@. -dnl -dnl *Warning*: its success or failure can depend on a proper setting of -dnl the CLASSPATH env. variable. -dnl -dnl TODO: allow to exclude virtual machines (rationale: most Java -dnl programs cannot run with some VM like kaffe). -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. -dnl -dnl A Web page, with a link to the latest CVS snapshot is at -dnl . -dnl -dnl This is a sample configure.in Process this file with autoconf to -dnl produce a configure script. -dnl -dnl AC_INIT(UnTag.java) -dnl -dnl dnl Checks for programs. -dnl AC_CHECK_CLASSPATH -dnl AC_PROG_JAVAC -dnl AC_PROG_JAVA -dnl -dnl dnl Checks for classes -dnl AC_CHECK_RQRD_CLASS(org.xml.sax.Parser) -dnl AC_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver) -dnl -dnl AC_OUTPUT(Makefile) -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_JAVA],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test x$JAVAPREFIX = x; then - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT) -else - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX) -fi -test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) -AC_PROG_JAVA_WORKS -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_java_cc.m4 b/m4/ac_prog_java_cc.m4 deleted file mode 100644 index 8a3b27c1db..0000000000 --- a/m4/ac_prog_java_cc.m4 +++ /dev/null @@ -1,68 +0,0 @@ -dnl @synopsis AC_PROG_JAVA_CC -dnl -dnl Finds the appropriate java compiler on your path. By preference the -dnl java compiler is gcj, then jikes then javac. -dnl -dnl The macro can take one argument specifying a space separated list -dnl of java compiler names. -dnl -dnl For example: -dnl -dnl AC_PROG_JAVA_CC(javac, gcj) -dnl -dnl The macro also sets the compiler options variable: JAVA_CC_OPTS to -dnl something sensible: -dnl -dnl - for GCJ it sets it to: @GCJ_OPTS@ -dnl (if GCJ_OPTS is not yet defined then it is set to "-C") -dnl -dnl - no other compiler has applicable options yet -dnl -dnl Here's an example configure.in: -dnl -dnl AC_INIT(Makefile.in) -dnl AC_PROG_JAVA_CC() -dnl AC_OUTPUT(Makefile) -dnl dnl End. -dnl -dnl And here's the start of the Makefile.in: -dnl -dnl PROJECT_ROOT := @srcdir@ -dnl # Tool definitions. -dnl JAVAC := @JAVA_CC@ -dnl JAVAC_OPTS := @JAVA_CC_OPTS@ -dnl JAR_TOOL := @jar_tool@ -dnl -dnl @category Java -dnl @author Nic Ferrier -dnl @version 2002-03-04 -dnl @license GPLWithACException - -# AC_PROG_JAVA_CC([COMPILER ...]) -# -------------------------- -# COMPILER ... is a space separated list of java compilers to search for. -# This just gives the user an opportunity to specify an alternative -# search list for the java compiler. -AC_DEFUN([AC_PROG_JAVA_CC], -[AC_ARG_VAR([JAVA_CC], [java compiler command])dnl -AC_ARG_VAR([JAVA_CC_FLAGS], [java compiler flags])dnl -m4_ifval([$1], - [AC_CHECK_TOOLS(JAVA_CC, [$1])], -[AC_CHECK_TOOL(JAVA_CC, gcj) -if test -z "$JAVA_CC"; then - AC_CHECK_TOOL(JAVA_CC, javac) -fi -if test -z "$JAVA_CC"; then - AC_CHECK_TOOL(JAVA_CC, jikes) -fi -]) - -if test "$JAVA_CC" = "gcj"; then - if test "$GCJ_OPTS" = ""; then - AC_SUBST(GCJ_OPTS,-C) - fi - AC_SUBST(JAVA_CC_OPTS, @GCJ_OPTS@, - [Define the compilation options for GCJ]) -fi -test -z "$JAVA_CC" && AC_MSG_ERROR([no acceptable java compiler found in \$PATH]) -])# AC_PROG_JAVA_CC diff --git a/m4/ac_prog_java_works.m4 b/m4/ac_prog_java_works.m4 deleted file mode 100644 index bb14a88e40..0000000000 --- a/m4/ac_prog_java_works.m4 +++ /dev/null @@ -1,98 +0,0 @@ -dnl @synopsis AC_PROG_JAVA_WORKS -dnl -dnl Internal use ONLY. -dnl -dnl Note: This is part of the set of autoconf M4 macros for Java -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. Unfortunately, the autoconf archive -dnl does not support the concept of set of macros, so I had to break it -dnl for submission. The general documentation, as well as the sample -dnl configure.in, is included in the AC_PROG_JAVA macro. -dnl -dnl @category Java -dnl @author Stephane Bortzmeyer -dnl @version 2000-07-19 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_JAVA_WORKS], [ -AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes) -if test x$uudecode = xyes; then -AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [ -dnl /** -dnl * Test.java: used to test if java compiler works. -dnl */ -dnl public class Test -dnl { -dnl -dnl public static void -dnl main( String[] argv ) -dnl { -dnl System.exit (0); -dnl } -dnl -dnl } -cat << \EOF > Test.uue -begin-base64 644 Test.class -yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE -bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51 -bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s -YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG -aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB -AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB -AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ= -==== -EOF -if uudecode$EXEEXT Test.uue; then - ac_cv_prog_uudecode_base64=yes -else - echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AC_FD_CC - echo "configure: failed file was:" >&AC_FD_CC - cat Test.uue >&AC_FD_CC - ac_cv_prog_uudecode_base64=no -fi -rm -f Test.uue]) -fi -if test x$ac_cv_prog_uudecode_base64 != xyes; then - rm -f Test.class - AC_MSG_WARN([I have to compile Test.class from scratch]) - if test x$ac_cv_prog_javac_works = xno; then - AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly]) - fi - if test x$ac_cv_prog_javac_works = x; then - AC_PROG_JAVAC - fi -fi -AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [ -JAVA_TEST=Test.java -CLASS_TEST=Test.class -TEST=Test -changequote(, )dnl -cat << \EOF > $JAVA_TEST -/* [#]line __oline__ "configure" */ -public class Test { -public static void main (String args[]) { - System.exit (0); -} } -EOF -changequote([, ])dnl -if test x$ac_cv_prog_uudecode_base64 != xyes; then - if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s $CLASS_TEST; then - : - else - echo "configure: failed program was:" >&AC_FD_CC - cat $JAVA_TEST >&AC_FD_CC - AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)) - fi -fi -if AC_TRY_COMMAND($JAVA $JAVAFLAGS $TEST) >/dev/null 2>&1; then - ac_cv_prog_java_works=yes -else - echo "configure: failed program was:" >&AC_FD_CC - cat $JAVA_TEST >&AC_FD_CC - AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?)) -fi -rm -fr $JAVA_TEST $CLASS_TEST Test.uue -]) -AC_PROVIDE([$0])dnl -] -) diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 deleted file mode 100644 index b0897e00f0..0000000000 --- a/m4/ac_prog_javac.m4 +++ /dev/null @@ -1,14 +0,0 @@ -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_prog_javac.html -dnl -AC_DEFUN([AC_PROG_JAVAC],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT) -else - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX) -fi -test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) -AC_PROG_JAVAC_WORKS -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4 deleted file mode 100644 index 7cfa54836a..0000000000 --- a/m4/ac_prog_javac_works.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_prog_javac_works.html -dnl -AC_DEFUN([AC_PROG_JAVAC_WORKS],[ -AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [ -JAVA_TEST=Test.java -CLASS_TEST=Test.class -cat << \EOF > $JAVA_TEST -/* [#]line __oline__ "configure" */ -public class Test { -} -EOF -if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then - ac_cv_prog_javac_works=yes -else - AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)]) - echo "configure: failed program was:" >&AC_FD_CC - cat $JAVA_TEST >&AC_FD_CC -fi -rm -f $JAVA_TEST $CLASS_TEST -]) -AC_PROVIDE([$0])dnl -]) diff --git a/m4/ac_prog_javah.m4 b/m4/ac_prog_javah.m4 deleted file mode 100644 index 0cc93f98fa..0000000000 --- a/m4/ac_prog_javah.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl @synopsis AC_PROG_JAVAH -dnl -dnl AC_PROG_JAVAH tests the availability of the javah header generator -dnl and looks for the jni.h header file. If available, JAVAH is set to -dnl the full path of javah and CPPFLAGS is updated accordingly. -dnl -dnl @category Java -dnl @author Luc Maisonobe -dnl @version 2002-03-25 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_JAVAH],[ -AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_PATH_PROG(JAVAH,javah) -if test x"`eval 'echo $ac_cv_path_JAVAH'`" != x ; then - AC_TRY_CPP([#include ],,[ - ac_save_CPPFLAGS="$CPPFLAGS" -changequote(, )dnl - ac_dir=`echo $ac_cv_path_JAVAH | sed 's,\(.*\)/[^/]*/[^/]*$,\1/include,'` - ac_machdep=`echo $build_os | sed 's,[-0-9].*,,' | sed 's,cygwin,win32,'` -changequote([, ])dnl - CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep" - AC_TRY_CPP([#include ], - ac_save_CPPFLAGS="$CPPFLAGS", - AC_MSG_WARN([unable to include ])) - CPPFLAGS="$ac_save_CPPFLAGS"]) -fi])