diff --git a/flaim/configure.ac b/flaim/configure.ac index 019b68d..6126ab8 100644 --- a/flaim/configure.ac +++ b/flaim/configure.ac @@ -30,14 +30,7 @@ AC_ARG_ENABLE([debug], [enable debug code (default is no)])], [debug="$withval"], [debug=no]) -# Check for doxygen program. -if test -z "$DOXYGEN"; then - AC_MSG_WARN([ - ----------------------------------------- - No Doxygen program found - continuing - without Doxygen documentation support. - -----------------------------------------]) -fi +# Automake conditionals AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x]) # Check for pthreads diff --git a/flaim/m4/ac_prog_try_doxygen.m4 b/flaim/m4/ac_prog_try_doxygen.m4 index 88711e4..255e46a 100644 --- a/flaim/m4/ac_prog_try_doxygen.m4 +++ b/flaim/m4/ac_prog_try_doxygen.m4 @@ -1,17 +1,33 @@ -dnl @synopsis AC_PROG_TRY_DOXYGEN -dnl -dnl AC_PROG_TRY_DOXYGEN tests for an existing doxygen program. -dnl It sets or uses the environment variable DOXYGEN. -dnl -dnl You can use the DOXYGEN variable in your Makefile.in, with -dnl @DOXYGEN@. -dnl -dnl @category Doxygen -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_TRY_DOXYGEN],[ -AC_REQUIRE([AC_EXEEXT])dnl -test -z "$DOXYGEN" && AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])dnl +# AC_PROG_TRY_DOXYGEN([quiet]) +# ---------------------------- +# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# documentation program. It sets or uses the environment +# variable DOXYGEN. +# +# If no arguments are given to this macro, and no doxygen +# program can be found, it prints a very visible message +# to STDOUT and to the config.log file. If the "quiet" +# argument is passed, then only the normal "check" line +# is displayed. (Technically, any passing any value in +# the first argument has the same effect as "quiet".) +# +# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in +# your Makefile.in files with @DOXYGEN@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_DOXYGEN], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl +AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No Doxygen program found - continuing + without Doxygen documentation support. + -----------------------------------------]) +fi])dnl ]) diff --git a/flaim/m4/flm_ftk_search.m4 b/flaim/m4/flm_ftk_search.m4 index df587f2..86d330d 100644 --- a/flaim/m4/flm_ftk_search.m4 +++ b/flaim/m4/flm_ftk_search.m4 @@ -3,16 +3,23 @@ # Define AC_ARG_VAR (user variables), FTKLIB and FTKINC, # allowing the user to specify the location of the flaim toolkit # library and header file. If not specified, check for these files: +# # 1. As a sub-project. # 2. As a super-project (sibling to the current project). # 3. As installed components on the system. +# # If found, AC_SUBST FTK_LTLIB and FTK_INCLUDE variables with # values derived from FTKLIB and FTKINC user variables. # FTKLIB and FTKINC are file locations, whereas FTK_LTLIB and # FTK_INCLUDE are linker and preprocessor command-line options. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# AC_DEFUN([FLM_FTK_SEARCH], -[AC_ARG_VAR([FTKLIB], [The PATH wherein libflaimtk.la can be found.]) -AC_ARG_VAR([FTKINC], [The PATH wherein flaimtk.h can be found.]) +[AC_ARG_VAR([FTKLIB], [The PATH wherein libflaimtk.la can be found]) +AC_ARG_VAR([FTKINC], [The PATH wherein flaimtk.h can be found]) dnl # Ensure that both or neither FTK paths were specified. if (test -n "$FTKLIB" && test -z "$FTKINC") || \ diff --git a/ftk/configure.ac b/ftk/configure.ac index 76b0a2a..c2684e0 100644 --- a/ftk/configure.ac +++ b/ftk/configure.ac @@ -32,14 +32,7 @@ AC_ARG_ENABLE([openssl], [enable the use of openssl (default is no)])], [openssl="$withval"], [openssl=no]) -# Check for doxygen program. -if test -z "$DOXYGEN"; then - AC_MSG_WARN([ - ----------------------------------------- - No Doxygen program found - continuing - without Doxygen documentation support. - -----------------------------------------]) -fi +# Create Automake conditional based on the DOXYGEN variable AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) # Check for pthreads @@ -52,7 +45,7 @@ ACX_PTHREAD( CXX="$PTHREAD_CXX"]) # Checks for libraries. -AC_CHECK_LIB([ncurses], [initscr]) +AC_SEARCH_LIBS([initscr], [ncurses]) AC_CHECK_LIB([rt], [aio_suspend]) if test "x$openssl" = xyes; then AC_DEFINE([FLM_OPENSSL], [], [Define to use openssl]) diff --git a/ftk/m4/ac_prog_try_doxygen.m4 b/ftk/m4/ac_prog_try_doxygen.m4 index 88711e4..255e46a 100644 --- a/ftk/m4/ac_prog_try_doxygen.m4 +++ b/ftk/m4/ac_prog_try_doxygen.m4 @@ -1,17 +1,33 @@ -dnl @synopsis AC_PROG_TRY_DOXYGEN -dnl -dnl AC_PROG_TRY_DOXYGEN tests for an existing doxygen program. -dnl It sets or uses the environment variable DOXYGEN. -dnl -dnl You can use the DOXYGEN variable in your Makefile.in, with -dnl @DOXYGEN@. -dnl -dnl @category Doxygen -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_TRY_DOXYGEN],[ -AC_REQUIRE([AC_EXEEXT])dnl -test -z "$DOXYGEN" && AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])dnl +# AC_PROG_TRY_DOXYGEN([quiet]) +# ---------------------------- +# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# documentation program. It sets or uses the environment +# variable DOXYGEN. +# +# If no arguments are given to this macro, and no doxygen +# program can be found, it prints a very visible message +# to STDOUT and to the config.log file. If the "quiet" +# argument is passed, then only the normal "check" line +# is displayed. (Technically, any passing any value in +# the first argument has the same effect as "quiet".) +# +# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in +# your Makefile.in files with @DOXYGEN@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_DOXYGEN], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl +AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No Doxygen program found - continuing + without Doxygen documentation support. + -----------------------------------------]) +fi])dnl ]) diff --git a/sql/configure.ac b/sql/configure.ac index 9cd7a70..9c5dfca 100644 --- a/sql/configure.ac +++ b/sql/configure.ac @@ -29,14 +29,7 @@ AC_ARG_ENABLE([debug], [enable debug code (default is no)])], [debug="$withval"], [debug=no]) -# Check for doxygen program. -if test -z "$DOXYGEN"; then - AC_MSG_WARN([ - ----------------------------------------- - No Doxygen program found - continuing - without Doxygen documentation support. - -----------------------------------------]) -fi +# Create Automake conditional based on the DOXYGEN variable AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x]) # Check for pthreads diff --git a/sql/m4/ac_prog_try_doxygen.m4 b/sql/m4/ac_prog_try_doxygen.m4 index 88711e4..255e46a 100644 --- a/sql/m4/ac_prog_try_doxygen.m4 +++ b/sql/m4/ac_prog_try_doxygen.m4 @@ -1,17 +1,33 @@ -dnl @synopsis AC_PROG_TRY_DOXYGEN -dnl -dnl AC_PROG_TRY_DOXYGEN tests for an existing doxygen program. -dnl It sets or uses the environment variable DOXYGEN. -dnl -dnl You can use the DOXYGEN variable in your Makefile.in, with -dnl @DOXYGEN@. -dnl -dnl @category Doxygen -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_TRY_DOXYGEN],[ -AC_REQUIRE([AC_EXEEXT])dnl -test -z "$DOXYGEN" && AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])dnl +# AC_PROG_TRY_DOXYGEN([quiet]) +# ---------------------------- +# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# documentation program. It sets or uses the environment +# variable DOXYGEN. +# +# If no arguments are given to this macro, and no doxygen +# program can be found, it prints a very visible message +# to STDOUT and to the config.log file. If the "quiet" +# argument is passed, then only the normal "check" line +# is displayed. (Technically, any passing any value in +# the first argument has the same effect as "quiet".) +# +# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in +# your Makefile.in files with @DOXYGEN@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_DOXYGEN], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl +AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No Doxygen program found - continuing + without Doxygen documentation support. + -----------------------------------------]) +fi])dnl ]) diff --git a/sql/m4/flm_ftk_search.m4 b/sql/m4/flm_ftk_search.m4 index df587f2..86d330d 100644 --- a/sql/m4/flm_ftk_search.m4 +++ b/sql/m4/flm_ftk_search.m4 @@ -3,16 +3,23 @@ # Define AC_ARG_VAR (user variables), FTKLIB and FTKINC, # allowing the user to specify the location of the flaim toolkit # library and header file. If not specified, check for these files: +# # 1. As a sub-project. # 2. As a super-project (sibling to the current project). # 3. As installed components on the system. +# # If found, AC_SUBST FTK_LTLIB and FTK_INCLUDE variables with # values derived from FTKLIB and FTKINC user variables. # FTKLIB and FTKINC are file locations, whereas FTK_LTLIB and # FTK_INCLUDE are linker and preprocessor command-line options. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# AC_DEFUN([FLM_FTK_SEARCH], -[AC_ARG_VAR([FTKLIB], [The PATH wherein libflaimtk.la can be found.]) -AC_ARG_VAR([FTKINC], [The PATH wherein flaimtk.h can be found.]) +[AC_ARG_VAR([FTKLIB], [The PATH wherein libflaimtk.la can be found]) +AC_ARG_VAR([FTKINC], [The PATH wherein flaimtk.h can be found]) dnl # Ensure that both or neither FTK paths were specified. if (test -n "$FTKLIB" && test -z "$FTKINC") || \ diff --git a/xflaim/configure.ac b/xflaim/configure.ac index 1b1f53b..3ad9f97 100644 --- a/xflaim/configure.ac +++ b/xflaim/configure.ac @@ -22,48 +22,23 @@ AC_PROG_INSTALL # Checks for optional programs. AC_PROG_TRY_CSC AC_PROG_TRY_CSVM -AC_PROG_TRY_JAVAC -AC_PROG_TRY_JAVAH +AC_PROG_TRY_JNI AC_PROG_TRY_JAVADOC -AC_PROG_TRY_JAR AC_PROG_TRY_DOXYGEN # Configure FTKLIB, FTKINC, FTK_LTLIB and FTK_INCLUDE FLM_FTK_SEARCH -# Check for Java compiler. -have_java=yes -if test -z "$JAVAC"; then have_java=no; fi -if test -z "$JAVAH"; then have_java=no; fi -if test -z "$JAR"; then have_java=no; fi -if test "x$have_java" = xno; then - AC_MSG_WARN([ - ----------------------------------------- - Some Java tools not found - continuing - without XFLAIM JNI support. - -----------------------------------------]) -fi -AM_CONDITIONAL([HAVE_JAVA], [test "x$have_java" = xyes]) +# Configure options: --enable-debug[=no]. +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], + [enable debug code (default is no)])], + [debug="$withval"], [debug=no]) -# Check for CSharp compiler. -if test -z "$CSC"; then - AC_MSG_WARN([ - ----------------------------------------- - No CSharp compiler found - continuing - without XFLAIM CSHARP support. - -----------------------------------------]) -fi +# Automake conditionals +AM_CONDITIONAL([HAVE_JAVA], [test "x$ac_prog_have_jni" = xyes]) AM_CONDITIONAL([HAVE_CSHARP], [test -n "$CSC"]) - -# Check for doxygen program. -if test -z "$DOXYGEN"; then - AC_MSG_WARN([ - ----------------------------------------- - No Doxygen program found - continuing - without Doxygen documentation support. - -----------------------------------------]) -fi -AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x]) +AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) # Check for pthreads ACX_PTHREAD( diff --git a/xflaim/m4/ac_prog_csc_works.m4 b/xflaim/m4/ac_prog_csc_works.m4 deleted file mode 100644 index bfc4737..0000000 --- a/xflaim/m4/ac_prog_csc_works.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl @synopsis AC_PROG_CSC_WORKS -dnl -dnl Internal use ONLY. -dnl -dnl Note: This is part of the set of autoconf M4 macros for CSharp -dnl programs. It is VERY IMPORTANT that you download the whole set, -dnl some macros depend on other. -dnl -dnl @category CSharp -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_CSC_WORKS],[ -AC_CACHE_CHECK([if $CSC works], ac_cv_prog_csc_works, [ -CSC_TEST=test.cs -TEST_EXE=test.exe -cat << \EOF > $CSC_TEST -/* [#]line __oline__ "configure" */ -public class Test { static void Main() {} } -EOF -if AC_TRY_COMMAND([$CSC $CSCFLAGS $CSC_TEST]) >/dev/null 2>&1; then - ac_cv_prog_csc_works=yes -else - AC_MSG_ERROR([The CSharp compiler $CSC failed (see config.log)]) - echo "configure: failed program was:" >&AC_FD_CC - cat $CSC_TEST >&AC_FD_CC -fi -rm -f $CSC_TEST $TEST_EXE -]) -AC_PROVIDE([$0])dnl -]) diff --git a/xflaim/m4/ac_prog_csvm_works.m4 b/xflaim/m4/ac_prog_csvm_works.m4 deleted file mode 100644 index d2db0e0..0000000 --- a/xflaim/m4/ac_prog_csvm_works.m4 +++ /dev/null @@ -1,134 +0,0 @@ -dnl @synopsis AC_PROG_CSVM_WORKS -dnl @category CSharp -dnl @author John Calcote -dnl @version 2008-06-17 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_CSVM_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 /** Test class to see if CSharp VM works. */ -dnl class Test { static void Main() {} } -cat << \EOF > Test.uue -begin-base64 755 Test.exe -TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAgAAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFt -IGNhbm5vdCBiZSBydW4gaW4gRE9TIG1vZGUuDQ0KJAAAAAAAAABQRQAATAED -AIUNWEgAAAAAAAAAAOAADgELAQYAAAQAAAAEAAAAAAAAACAAAAAgAAAAQAAA -AABAAAAgAAAAAgAABAAAAAAAAAAEAAAAAAAAAACAAAAAAgAAAAAAAAMAAAAA -ABAAABAAAAAAEAAAEAAAAAAAABAAAAAAAAAAAAAAABggAABPAAAAAEAAAMwC -AAAAAAAAAAAAAAAAAAAAAAAAAGAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQIAAACAAAAAAAAAAAAAAA -ZCAAAEgAAAAAAAAAAAAAAC50ZXh0AAAAeAIAAAAgAAAABAAAAAIAAAAAAAAA -AAAAAAAAACAAAGAucnNyYwAAAMwCAAAAQAAAAAQAAAAGAAAAAAAAAAAAAAAA -AABAAABALnJlbG9jAAAMAAAAAGAAAAACAAAACgAAAAAAAAAAAAAAAAAAQAAA -QgAAAAAAAAAAAAAAAAAAAAD/JRAgQAAAAAAAAAAAAAAAQCAAAAAAAABaIAAA -AAAAAAAAAABOIAAAECAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfQ29yRXhl -TWFpbgBtc2NvcmVlLmRsbABAIAAAAAAAAAAASAAAAAIAAAD4IAAAgAEAAAEA -AAACAAAG+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4CKAEAAAoqBioAAEJTSkIB -AAEAAAAAAAwAAAB2MS4xLjQzMjIAAAAAAAUAcAAAAKwAAAAjfgAAHAEAADwA -AAAjU3RyaW5ncwAAAABYAQAABAAAACNVUwBcAQAAFAAAACNCbG9iAAAAcAEA -ABAAAAAjR1VJRAAAAAAAAAAAAAAAAQAAAUcEAAAJAAAAAAAAAAAAAAABAAAA -AQAAAAIAAAACAAAAAQAAAAEAAAABAAAAAAAsAAEAAAAAAAYACgARAAAAAAAj -AAAAAAABAAEAAAAQAB4AAAAFAAEAAQDsIAAAAACGGBgAAQABAPQgAAAAAJEA -NQAOAAEACQAYAAEABIAAAAAAAAAAAAAAAAAAAAAAHgAAAAEAAACIEwAAAAAA -AAUAAQAAAAAAAG1zY29ybGliAE9iamVjdABTeXN0ZW0ALmN0b3IAVGVzdAA8 -TW9kdWxlPgBUZXN0LmV4ZQBNYWluAAAAAAAAAAADIAABCLd6XFYZNOCJAwAA -AQAAA/ywUUx/c0y9yzj+P4QQNQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAABABAAAAAYAACAAAAAAAAAAAAAAAAAAAAB -AAEAAAAwAACAAAAAAAAAAAAAAAAAAAABAAAAAABIAAAAWEAAAHQCAAAAAAAA -AAAAAHQCNAAAAFYAUwBfAFYARQBSAFMASQBPAE4AXwBJAE4ARgBPAAAAAAC9 -BO/+AAABAAAAAAAAAAAAAAAAAAAAAAA/AAAAAAAAAAQAAAACAAAAAAAAAAAA -AAAAAAAARAAAAAEAVgBhAHIARgBpAGwAZQBJAG4AZgBvAAAAAAAkAAQAAABU -AHIAYQBuAHMAbABhAHQAaQBvAG4AAAAAAH8AsATUAQAAAQBTAHQAcgBpAG4A -ZwBGAGkAbABlAEkAbgBmAG8AAACwAQAAAQAwADAANwBmADAANABiADAAAAAo -AAIAAQBQAHIAbwBkAHUAYwB0AFYAZQByAHMAaQBvAG4AAAAgAAAAJAACAAEA -QwBvAG0AcABhAG4AeQBOAGEAbQBlAAAAAAAgAAAAJAACAAEAUAByAG8AZAB1 -AGMAdABOAGEAbQBlAAAAAAAgAAAAKAACAAEATABlAGcAYQBsAEMAbwBwAHkA -cgBpAGcAaAB0AAAAIAAAACwABQABAEkAbgB0AGUAcgBuAGEAbABOAGEAbQBl -AAAAVABlAHMAdAAAAAAALAACAAEARgBpAGwAZQBEAGUAcwBjAHIAaQBwAHQA -aQBvAG4AAAAAACAAAAAcAAIAAQBDAG8AbQBtAGUAbgB0AHMAAAAgAAAAJAAC -AAEARgBpAGwAZQBWAGUAcgBzAGkAbwBuAAAAAAAgAAAAPAAJAAEATwByAGkA -ZwBpAG4AYQBsAEYAaQBsAGUAbgBhAG0AZQAAAFQAZQBzAHQALgBlAHgAZQAA -AAAALAACAAEATABlAGcAYQBsAFQAcgBhAGQAZQBtAGEAcgBrAHMAAAAAACAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAM -AAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAA -==== -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.cs from scratch]) - if test x$ac_cv_prog_csc_works = xno; then - AC_MSG_ERROR([Cannot compile CSharp source. $CSC does not work properly]) - fi - if test x$ac_cv_prog_csc_works = x; then - AC_PROG_TRY_CSC - fi -fi -AC_CACHE_CHECK([if $CSVM works], [ac_cv_prog_csvm_works], [ -CS_TEST=Test.cs -TEST_EXE=Test.exe -changequote(, )dnl -cat << \EOF > $CS_TEST -/* [#]line __oline__ "configure" */ -class Test { static void Main() { } } -EOF -changequote([, ])dnl -if test x$ac_cv_prog_uudecode_base64 != xyes; then - if AC_TRY_COMMAND([$CSC $CSCFLAGS $CS_TEST]) && test -s $TEST_EXE; then - : - else - echo "configure: failed program was:" >&AC_FD_CC - cat $CS_TEST >&AC_FD_CC - AC_MSG_ERROR([The CSharp compiler $CSC failed (see config.log)]) - fi -fi -if AC_TRY_COMMAND([$CSVM $CSVMFLAGS $TEST_EXE]) >/dev/null 2>&1; then - ac_cv_prog_csvm_works=yes -else - echo "configure: failed program was:" >&AC_FD_CC - cat $CS_TEST >&AC_FD_CC - AC_MSG_ERROR([The CSharp VM $CSVM failed (see config.log)]) -fi -rm -fr $CS_TEST $TEST_EXE Test.uue -]) -AC_PROVIDE([$0])dnl -]) diff --git a/xflaim/m4/ac_prog_java_works.m4 b/xflaim/m4/ac_prog_java_works.m4 deleted file mode 100644 index bb14a88..0000000 --- a/xflaim/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/xflaim/m4/ac_prog_javac_works.m4 b/xflaim/m4/ac_prog_javac_works.m4 deleted file mode 100644 index 78af5c4..0000000 --- a/xflaim/m4/ac_prog_javac_works.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl @synopsis AC_PROG_JAVAC_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_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/xflaim/m4/ac_prog_try_csc.m4 b/xflaim/m4/ac_prog_try_csc.m4 index 0056c5a..440bcab 100644 --- a/xflaim/m4/ac_prog_try_csc.m4 +++ b/xflaim/m4/ac_prog_try_csc.m4 @@ -1,19 +1,33 @@ -dnl @synopsis AC_PROG_TRY_CSC -dnl -dnl AC_PROG_TRY_CSC looks for an existing CSharp compiler. It sets -dnl and/or uses the environment variable CSC, then tests for the -dnl Mono CSharp compiler. -dnl -dnl You can use the CSC variable in your Makefile.in, with @CSC@. -dnl -dnl @category CSharp -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_CSC],[ -AC_REQUIRE([AC_EXEEXT])dnl -test -z "$CSC" && AC_CHECK_PROGS([CSC], [mcs$EXEEXT csc$EXEEXT]) -if test -n "$CSC"; then - AC_PROG_CSC_WORKS -fi]) +# AC_PROG_TRY_CSC([quiet]) +# ------------------------ +# AC_PROG_TRY_CSC looks for an existing CSharp compiler. If the +# CSC variable is empty, it checks for a Mono CSharp compiler +# and then for a Microsoft CSharp compiler. +# +# If no arguments are given to this macro, and no CSharp compiler +# can be found, it prints a very visible message to STDOUT and to +# the config.log file. If the "quiet" argument is passed, then +# only the normal "check" line is displayed. (Technically, any +# passing any value in the first argument has the same effect as +# passing "quiet".) +# +# Makes CSC precious to Autoconf. You can use CSC variable in +# your Makefile.in with @CSC@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_CSC], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([CSC], [CSharp compiler])dnl +AC_CHECK_PROGS([CSC], [mcs$EXEEXT csc$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$CSC"; then + AC_MSG_WARN([ + ----------------------------------------- + No CSharp compiler found - continuing + without CSHARP compiler support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_csvm.m4 b/xflaim/m4/ac_prog_try_csvm.m4 index 1fad2e9..9150310 100644 --- a/xflaim/m4/ac_prog_try_csvm.m4 +++ b/xflaim/m4/ac_prog_try_csvm.m4 @@ -1,22 +1,34 @@ -dnl @synopsis AC_PROG_TRY_CSVM -dnl -dnl AC_PROG_TRY_CSVM looks for an existing CSharp virtual machine. -dnl It sets and/or uses the environment variable CSC, then tests -dnl for the Mono CSharp compiler. -dnl -dnl If and when a CSVM is located, it's then tested via -dnl AC_PROG_CSVM_WORKS. -dnl -dnl You can use the CSVM variable in your Makefile.in, with @CSVM@. -dnl -dnl @category CSharp -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_CSVM],[ -AC_REQUIRE([AC_EXEEXT])dnl -test -z "$CSVM" && AC_CHECK_PROGS([CSVM], [mono$EXEEXT cs$EXEEXT]) -if test -n "$CSVM"; then - AC_PROG_CSVM_WORKS -fi]) +# AC_PROG_TRY_CSVM([quiet]) +# ------------------------- +# AC_PROG_TRY_CSVM looks for an existing CSharp virtual machine. +# If the CSVM environment variable is not already set, it looks +# in the system path for a program named mono, and then for one +# named cs (the Microsoft CSharp VM). +# +# If no arguments are given to this macro, and no CSharp VM can +# be found, it prints a very visible message to STDOUT and to +# the config.log file. If the "quiet" argument is passed, then +# only the normal "check" line is displayed. (Technically, any +# passing any value in the first argument has the same effect +# as "quiet".) +# +# Makes CSVM precious to Autoconf. You can use CSVM in your +# Makefile.in with @CSVM@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_CSVM], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([CSVM], [CSharp virtual machine])dnl +AC_CHECK_PROGS([CSVM], [mono$EXEEXT cs$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$CSVM"; then + AC_MSG_WARN([ + ----------------------------------------- + No CSharp VM found - continuing without + CSharp Virtual Machine support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_doxygen.m4 b/xflaim/m4/ac_prog_try_doxygen.m4 index 88711e4..255e46a 100644 --- a/xflaim/m4/ac_prog_try_doxygen.m4 +++ b/xflaim/m4/ac_prog_try_doxygen.m4 @@ -1,17 +1,33 @@ -dnl @synopsis AC_PROG_TRY_DOXYGEN -dnl -dnl AC_PROG_TRY_DOXYGEN tests for an existing doxygen program. -dnl It sets or uses the environment variable DOXYGEN. -dnl -dnl You can use the DOXYGEN variable in your Makefile.in, with -dnl @DOXYGEN@. -dnl -dnl @category Doxygen -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license AllPermissive - -AC_DEFUN([AC_PROG_TRY_DOXYGEN],[ -AC_REQUIRE([AC_EXEEXT])dnl -test -z "$DOXYGEN" && AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])dnl +# AC_PROG_TRY_DOXYGEN([quiet]) +# ---------------------------- +# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# documentation program. It sets or uses the environment +# variable DOXYGEN. +# +# If no arguments are given to this macro, and no doxygen +# program can be found, it prints a very visible message +# to STDOUT and to the config.log file. If the "quiet" +# argument is passed, then only the normal "check" line +# is displayed. (Technically, any passing any value in +# the first argument has the same effect as "quiet".) +# +# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in +# your Makefile.in files with @DOXYGEN@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_DOXYGEN], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl +AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No Doxygen program found - continuing + without Doxygen documentation support. + -----------------------------------------]) +fi])dnl ]) diff --git a/xflaim/m4/ac_prog_try_jar.m4 b/xflaim/m4/ac_prog_try_jar.m4 index da04e7a..d4d7f8e 100644 --- a/xflaim/m4/ac_prog_try_jar.m4 +++ b/xflaim/m4/ac_prog_try_jar.m4 @@ -1,20 +1,33 @@ -dnl @synopsis AC_PROG_TRY_JAR -dnl -dnl AC_PROG_TRY_JAR tests for an existing jar program. It sets and/or -dnl uses the environment variable JAR then tests in sequence various -dnl common jar programs. -dnl -dnl You can use the JAR variable in your Makefile.in, with @JAR@. -dnl -dnl @category Java -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_JAR],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test -z "$JAVAPREFIX"; then - test -z "$JAR" && AC_CHECK_PROGS([JAR], [jar$EXEEXT]) -else - test -z "$JAR" && AC_CHECK_PROGS([JAR], [jar$EXEEXT], [$JAVAPREFIX]) -fi]) +# AC_PROG_TRY_JAR([quiet]) +# ------------------------ +# AC_PROG_TRY_JAR tests for an existing jar program. If the JAR +# environment variable is empty, then it searches for a jar program +# in the system search path. +# +# If no arguments are given to this macro, and no jar program +# can be found, it prints a very visible message to STDOUT and +# to the config.log file. If the "quiet" argument is passed, +# then only the normal "check" line is displayed. (Technically, +# any passing any value in the first argument has the same effect +# as passing "quiet".) +# +# Makes JAR precious to Autoconf. You can use JAR in your +# Makefile.in files with @JAR@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_JAR], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([JAR], [Java archive utility])dnl +AC_CHECK_PROGS([JAR], [jar$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$JAR"; then + AC_MSG_WARN([ + ----------------------------------------- + No Java jar utility found - continuing + without Java Archive support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_java.m4 b/xflaim/m4/ac_prog_try_java.m4 index 11455d1..ab7330f 100644 --- a/xflaim/m4/ac_prog_try_java.m4 +++ b/xflaim/m4/ac_prog_try_java.m4 @@ -1,26 +1,33 @@ -dnl @synopsis AC_PROG_TRY_JAVA -dnl -dnl AC_PROG_TRY_JAVA looks for an existing JAVA virtual machine. It -dnl sets and/or uses the environment variable JAVA, then tests for -dnl various Java virtual machines, beginning with the free ones. -dnl -dnl If and when a JVM is located, it's then tested via -dnl AC_PROG_JAVA_WORKS. -dnl -dnl You can use the JAVA variable in your Makefile.in, with @JAVA@. -dnl -dnl @category Java -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_JAVA],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test -z "$JAVAPREFIX"; then - test -z "$JAVA" && AC_CHECK_PROGS([JAVA], [kaffe$EXEEXT java$EXEEXT]) -else - test -z "$JAVA" && AC_CHECK_PROGS([JAVA], [kaffe$EXEEXT java$EXEEXT], [$JAVAPREFIX]) -fi -if test -n "$JAVA"; then - AC_PROG_JAVA_WORKS -fi]) +# AC_PROG_TRY_JAVA([quiet]) +# ------------------------- +# AC_PROG_TRY_JAVA looks for an existing JAVA virtual machine. If +# the JAVA environment variable is empty, it searches the system +# path for a java program. +# +# If no arguments are given to this macro, and no java virtual +# machine can be found, it prints a very visible message to STDOUT +# and to the config.log file. If the "quiet" argument is passed, +# then only the normal "check" line is displayed. (Technically, +# any passing any value in the first argument has the same effect +# as "quiet".) +# +# Makes JAVA precious to Autoconf. You can use the JAVA variable +# in your Makefile.in files with @JAVA@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_JAVA], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([JAVA], [Java virtual machine])dnl +AC_CHECK_PROGS([JAVA], [kaffe$EXEEXT java$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No Doxygen program found - continuing + without Doxygen documentation support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_javac.m4 b/xflaim/m4/ac_prog_try_javac.m4 index 1a8d3ae..cee7962 100644 --- a/xflaim/m4/ac_prog_try_javac.m4 +++ b/xflaim/m4/ac_prog_try_javac.m4 @@ -1,23 +1,33 @@ -dnl @synopsis AC_PROG_TRY_JAVAC -dnl -dnl AC_PROG_TRY_JAVAC looks for an existing Java compiler. It sets -dnl and/or uses the environment variable JAVAC, then tests for -dnl various known java compilers, beginning with free ones. -dnl -dnl You can use the JAVAC variable in your Makefile.in, with @JAVAC@. -dnl -dnl @category Java -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_JAVAC],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test -z "$JAVAPREFIX"; then - test -z "$JAVAC" && AC_CHECK_PROGS([JAVAC], ["gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT]) -else - test -z "$JAVAC" && AC_CHECK_PROGS([JAVAC], ["gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT], [$JAVAPREFIX]) -fi -if test -n "$JAVAC"; then - AC_PROG_JAVAC_WORKS -fi]) +# AC_PROG_TRY_JAVAC([quiet]) +# -------------------------- +# AC_PROG_TRY_JAVAC looks for an existing Java compiler. If the +# JAVAC environment variable is not set, it searches the system +# path for a Java compiler, beginning with the free ones. +# +# If no arguments are given to this macro, and no Java compiler +# can be found, it prints a very visible message to STDOUT and +# to the config.log file. If the "quiet" argument is passed, +# then only the normal "check" line is displayed. (Technically, +# any passing any value in the first argument has the same effect +# as "quiet".) +# +# Makes JAVAC precious to Autoconf. You can use the JAVAC +# variable in your Makefile.in files with @JAVAC@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_JAVAC], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([JAVAC], [Java compiler])dnl +AC_CHECK_PROGS([JAVAC], ["gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No Java compiler found - continuing + without Java compiler support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_javadoc.m4 b/xflaim/m4/ac_prog_try_javadoc.m4 index bdd0810..d563dbb 100644 --- a/xflaim/m4/ac_prog_try_javadoc.m4 +++ b/xflaim/m4/ac_prog_try_javadoc.m4 @@ -1,21 +1,33 @@ -dnl @synopsis AC_PROG_TRY_JAVADOC -dnl -dnl AC_PROG_TRY_JAVADOC tests for an existing javadoc generator. -dnl It uses and/or sets the environment variable JAVADOC, then -dnl tests in sequence various common javadoc generator. -dnl -dnl You can use the JAVADOC variable in your Makefile.in, with -dnl @JAVADOC@. -dnl -dnl @category Java -dnl @author John Calcote -dnl @version 2008-06-24 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_JAVADOC],[ -AC_REQUIRE([AC_EXEEXT])dnl -if test -z "$JAVAPREFIX"; then - test -z "$JAVADOC" && AC_CHECK_PROGS([JAVADOC], [javadoc$EXEEXT]) -else - test -z "$JAVADOC" && AC_CHECK_PROGS([JAVADOC], [javadoc$EXEEXT], [$JAVAPREFIX]) -fi]) +# AC_PROG_TRY_JAVADOC([quiet]) +# ---------------------------- +# AC_PROG_TRY_JAVADOC tests for an existing javadoc generator. +# If the JAVADOC environment variable is not set, it searches the +# system path to find it. +# +# If no arguments are given to this macro, and no doxygen +# program can be found, it prints a very visible message +# to STDOUT and to the config.log file. If the "quiet" +# argument is passed, then only the normal "check" line +# is displayed. (Technically, any passing any value in +# the first argument has the same effect as "quiet".) +# +# Makes JAVADOC precious to Autoconf. You can use the JAVADOC +# variable in your Makefile.in files with @JAVADOC@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_JAVADOC], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_ARG_VAR([JAVADOC], [Java source documentation utility])dnl +AC_CHECK_PROGS([JAVADOC], [javadoc$EXEEXT]) +m4_ifvaln([$1],, +[if test -z "$JAVADOC"; then + AC_MSG_WARN([ + ----------------------------------------- + No javadoc program found - continuing + without javadoc documentation support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_javah.m4 b/xflaim/m4/ac_prog_try_javah.m4 index e9d8018..dc8add1 100644 --- a/xflaim/m4/ac_prog_try_javah.m4 +++ b/xflaim/m4/ac_prog_try_javah.m4 @@ -1,30 +1,34 @@ -dnl @synopsis AC_PROG_TRY_JAVAH -dnl -dnl AC_PROG_TRY_JAVAH looks for an existing Java native header (JNI) -dnl generator. It sets and/or uses the environment variable JAVAH, -dnl then tests for the javah utility, beginning with free ones. -dnl -dnl You can use the JAVAH variable in your Makefile.in, with @JAVAH@. -dnl -dnl @category Java -dnl @author John Calcote -dnl @version 2008-06-23 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_TRY_JAVAH],[ -AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl +# AC_PROG_TRY_JAVAH([quiet]) +# -------------------------- +# AC_PROG_TRY_JAVAH looks for an existing Java native header (JNI) +# generator. If the JAVAH environment variable is not set, it looks +# in the system path for a javah program. +# +# If no arguments are given to this macro, and no javah program +# can be found, it prints a very visible message to STDOUT and +# to the config.log file. If the "quiet" argument is passed, +# then only the normal "check" line is displayed. (Technically, +# any passing any value in the first argument has the same effect +# as "quiet".) +# +# Makes JAVAH precious to Autoconf. You can use the JAVAH +# variable in your Makefile.in files with @JAVAH@. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_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]) +AC_ARG_VAR([JAVAH], [Java header utility])dnl +AC_CHECK_PROGS([JAVAH], [javah]) +m4_ifvaln([$1],, +[if test -z "$DOXYGEN"; then + AC_MSG_WARN([ + ----------------------------------------- + No javah utility found - continuing + without Java Header utility support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/ac_prog_try_jni.m4 b/xflaim/m4/ac_prog_try_jni.m4 new file mode 100644 index 0000000..0a46c19 --- /dev/null +++ b/xflaim/m4/ac_prog_try_jni.m4 @@ -0,0 +1,42 @@ +# AC_PROG_TRY_JNI([quiet]) +# ------------------------ +# AC_PROG_TRY_JNI tests for the existence of the three +# tools required to build Java Native Interface (JNI) +# modules: javac, javah, and jar +# +# If one or more of the tools are not found, and the "quiet" +# parameter was not passed, then it prints a very visible +# message to STDOUT and to the log file indicating that the +# build process will continue without JNI support. +# +# In the process, the JAVAC, JAVAH and JAR environment +# variables are made precious to Autoconf. You can use them +# in your Makefile.in files with @JAVAC@, @JAVAH@ and @JAR@. +# +# If all three tools are present, then the ac_prog_have_jni +# environment variable is set to 'yes', otherwise it's set to +# 'no'. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# +AC_DEFUN([AC_PROG_TRY_JNI], +[AC_REQUIRE([AC_EXEEXT])dnl +AC_PROG_TRY_JAVAC([quiet])dnl +AC_PROG_TRY_JAVAH([quiet])dnl +AC_PROG_TRY_JAR([quiet])dnl +m4_ifvaln([$1],, +[ac_prog_have_jni=yes +if test -z "$JAVAC"; then ac_prog_have_jni=no; fi +if test -z "$JAVAH"; then ac_prog_have_jni=no; fi +if test -z "$JAR"; then ac_prog_have_jni=no; fi +if test "x$ac_prog_have_jni" = xno; then + AC_MSG_WARN([ + ----------------------------------------- + Some required Java Native Interface + tools missing - continuing without + project JNI support. + -----------------------------------------]) +fi])dnl +]) diff --git a/xflaim/m4/flm_ftk_search.m4 b/xflaim/m4/flm_ftk_search.m4 index df587f2..86d330d 100644 --- a/xflaim/m4/flm_ftk_search.m4 +++ b/xflaim/m4/flm_ftk_search.m4 @@ -3,16 +3,23 @@ # Define AC_ARG_VAR (user variables), FTKLIB and FTKINC, # allowing the user to specify the location of the flaim toolkit # library and header file. If not specified, check for these files: +# # 1. As a sub-project. # 2. As a super-project (sibling to the current project). # 3. As installed components on the system. +# # If found, AC_SUBST FTK_LTLIB and FTK_INCLUDE variables with # values derived from FTKLIB and FTKINC user variables. # FTKLIB and FTKINC are file locations, whereas FTK_LTLIB and # FTK_INCLUDE are linker and preprocessor command-line options. +# +# Author: John Calcote +# Modified: 2009-04-22 +# License: AllPermissive +# AC_DEFUN([FLM_FTK_SEARCH], -[AC_ARG_VAR([FTKLIB], [The PATH wherein libflaimtk.la can be found.]) -AC_ARG_VAR([FTKINC], [The PATH wherein flaimtk.h can be found.]) +[AC_ARG_VAR([FTKLIB], [The PATH wherein libflaimtk.la can be found]) +AC_ARG_VAR([FTKINC], [The PATH wherein flaimtk.h can be found]) dnl # Ensure that both or neither FTK paths were specified. if (test -n "$FTKLIB" && test -z "$FTKINC") || \