mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated m4 macros to be more specific about which options are acceptible in arg1.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1094 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-04-27 20:07:07 +00:00
parent 6f1792f3ff
commit 56e32ca56f
12 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flaim/m4/ac_prog_try_doxygen.m4
View File

@@ -18,15 +18,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
fi])dnl
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
ftk/m4/ac_prog_try_doxygen.m4
View File

@@ -18,15 +18,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
fi])dnl
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
sql/m4/ac_prog_try_doxygen.m4
View File

@@ -18,15 +18,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
fi])dnl
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
xflaim/m4/ac_prog_try_csc.m4
View File

@@ -20,15 +20,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$CSC"; then
AC_MSG_WARN([No CSharp compiler found - continuing without CSharp support])
fi])dnl
AC_MSG_WARN([CSharp compiler not found - continuing without CSharp])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
xflaim/m4/ac_prog_try_csvm.m4
View File

@@ -17,15 +17,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$CSVM"; then
AC_MSG_WARN([No CSharp virtual machine found - continuing without CSVM support])
fi])dnl
AC_MSG_WARN([CSharp VM not found - continuing without CSharp VM])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
xflaim/m4/ac_prog_try_doxygen.m4
View File

@@ -18,15 +18,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
fi])dnl
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
xflaim/m4/ac_prog_try_jar.m4
View File

@@ -17,15 +17,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$JAR"; then
AC_MSG_WARN([No Java jar utility found - continuing without Java jar support])
fi])dnl
AC_MSG_WARN([Java ARchive program not found - continuing without jar])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

10
xflaim/m4/ac_prog_try_java.m4
View File

@@ -17,15 +17,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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 Java virtual machine found - continuing without JVM support])
fi])dnl
ifelse([$1],,
[if test -z "$JAVA"; then
AC_MSG_WARN([Java VM not found - continuing without JVM])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

10
xflaim/m4/ac_prog_try_javac.m4
View File

@@ -17,15 +17,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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 support])
fi])dnl
ifelse([$1],,
[if test -z "$JAVAC"; then
AC_MSG_WARN([Java compiler not found - continuing without javac])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

8
xflaim/m4/ac_prog_try_javadoc.m4
View File

@@ -17,15 +17,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# 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],,
ifelse([$1],,
[if test -z "$JAVADOC"; then
AC_MSG_WARN([No javadoc program found - continuing without javadoc support])
fi])dnl
AC_MSG_WARN([Javadoc program not found - continuing without javadoc])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

15
xflaim/m4/ac_prog_try_javah.m4
View File

@@ -17,16 +17,15 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# License: AllPermissive
#
AC_DEFUN([AC_PROG_TRY_JAVAH],
[AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
AC_REQUIRE([AC_PROG_CPP])dnl
[AC_REQUIRE([AC_EXEEXT])dnl
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 wihtout javah support])
fi])dnl
AC_CHECK_PROGS([JAVAH], [javah$EXEEXT])
ifelse([$1],,
[if test -z "$JAVAH"; then
AC_MSG_WARN([Java header program not found - continuing without javah])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])

6
xflaim/m4/ac_prog_try_jni.m4
View File

@@ -24,7 +24,7 @@
# not rely on this, as all other words are reserved.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-23
# Modified: 2009-04-27
# License: AllPermissive
#
AC_DEFUN([AC_PROG_TRY_JNI],
@@ -32,12 +32,12 @@ AC_DEFUN([AC_PROG_TRY_JNI],
AC_PROG_TRY_JAVAC([quiet])dnl
AC_PROG_TRY_JAVAH([quiet])dnl
AC_PROG_TRY_JAR([quiet])dnl
m4_ifvaln([$1],,
ifelse([$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 JNI tools are missing - continuing without JNI support])
fi])dnl
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])