From a165b65d1e756b344d55d01f4fb5340121d1b6e0 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 8 Mar 2015 18:58:14 -0400 Subject: Initial javac check --- Makefile.in | 1 + configure | 39 +++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + doc/Makefile.in | 1 + scripts/Makefile.in | 1 + src/Makefile.in | 1 + src/analysis/Makefile.in | 1 + src/cal/Makefile.in | 1 + src/cal/geom/Makefile.in | 1 + src/cal/get_tle/Makefile.in | 1 + src/cal/jitter/Makefile.in | 1 + src/cal/parm/Makefile.in | 1 + src/cal/saa/Makefile.in | 1 + src/cal/screen/Makefile.in | 1 + src/fes/Makefile.in | 1 + src/fuv/Makefile.in | 1 + src/libcf/Makefile.in | 1 + src/slalib/Makefile.in | 1 + 18 files changed, 56 insertions(+) diff --git a/Makefile.in b/Makefile.in index 56edd75..d692b8c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -235,6 +235,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/configure b/configure index 871b311..64d5449 100755 --- a/configure +++ b/configure @@ -642,6 +642,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG ALLOCA +HAVE_JAVAC ac_ct_F77 FFLAGS F77 @@ -15976,6 +15977,44 @@ else $as_echo "no, using $LN_S" >&6; } fi +# Extract the first word of "javac", so it can be a program name with args. +set dummy javac; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_HAVE_JAVAC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_JAVAC"; then + ac_cv_prog_HAVE_JAVAC="$HAVE_JAVAC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_JAVAC="`which javac`" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_JAVAC" && ac_cv_prog_HAVE_JAVAC="javac not found" +fi +fi +HAVE_JAVAC=$ac_cv_prog_HAVE_JAVAC +if test -n "$HAVE_JAVAC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_JAVAC" >&5 +$as_echo "$HAVE_JAVAC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Checks for libraries. diff --git a/configure.ac b/configure.ac index 6c11be9..b4edf4c 100644 --- a/configure.ac +++ b/configure.ac @@ -13,6 +13,7 @@ AC_CONFIG_HEADERS([src/include/config.h]) AC_PROG_CC AC_PROG_F77 AC_PROG_LN_S +AC_CHECK_PROG(HAVE_JAVAC, javac, [`which javac`], [javac not found]) # Checks for libraries. diff --git a/doc/Makefile.in b/doc/Makefile.in index 165934e..4a5b733 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -181,6 +181,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 4dc5d3f..1a53ab3 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -241,6 +241,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/Makefile.in b/src/Makefile.in index 6b75245..b52ad9d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -211,6 +211,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/analysis/Makefile.in b/src/analysis/Makefile.in index e847a8c..1226197 100644 --- a/src/analysis/Makefile.in +++ b/src/analysis/Makefile.in @@ -410,6 +410,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/Makefile.in b/src/cal/Makefile.in index 6993680..9ab1f7d 100644 --- a/src/cal/Makefile.in +++ b/src/cal/Makefile.in @@ -211,6 +211,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/geom/Makefile.in b/src/cal/geom/Makefile.in index 388b480..c5e80dd 100644 --- a/src/cal/geom/Makefile.in +++ b/src/cal/geom/Makefile.in @@ -208,6 +208,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/get_tle/Makefile.in b/src/cal/get_tle/Makefile.in index 9e2aee8..02af442 100644 --- a/src/cal/get_tle/Makefile.in +++ b/src/cal/get_tle/Makefile.in @@ -184,6 +184,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/jitter/Makefile.in b/src/cal/jitter/Makefile.in index 0a8c5fa..27868f4 100644 --- a/src/cal/jitter/Makefile.in +++ b/src/cal/jitter/Makefile.in @@ -252,6 +252,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/parm/Makefile.in b/src/cal/parm/Makefile.in index 2524870..3f55458 100644 --- a/src/cal/parm/Makefile.in +++ b/src/cal/parm/Makefile.in @@ -208,6 +208,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/saa/Makefile.in b/src/cal/saa/Makefile.in index d215108..a59213d 100644 --- a/src/cal/saa/Makefile.in +++ b/src/cal/saa/Makefile.in @@ -207,6 +207,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/cal/screen/Makefile.in b/src/cal/screen/Makefile.in index 41bd84b..272595c 100644 --- a/src/cal/screen/Makefile.in +++ b/src/cal/screen/Makefile.in @@ -209,6 +209,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/fes/Makefile.in b/src/fes/Makefile.in index 67f9500..6d5936b 100644 --- a/src/fes/Makefile.in +++ b/src/fes/Makefile.in @@ -256,6 +256,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/fuv/Makefile.in b/src/fuv/Makefile.in index 80d7a39..e58af38 100644 --- a/src/fuv/Makefile.in +++ b/src/fuv/Makefile.in @@ -303,6 +303,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/libcf/Makefile.in b/src/libcf/Makefile.in index 3d7372d..926391d 100644 --- a/src/libcf/Makefile.in +++ b/src/libcf/Makefile.in @@ -280,6 +280,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/slalib/Makefile.in b/src/slalib/Makefile.in index 07d157e..9d5593e 100644 --- a/src/slalib/Makefile.in +++ b/src/slalib/Makefile.in @@ -272,6 +272,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_JAVAC = @HAVE_JAVAC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -- cgit