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

Updated macro files, and fixed a bug in xflaim/cs/wrapper/Makefile.am

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1110 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-08-31 22:26:47 +00:00
parent cc6f53b5cc
commit a3072f8f68
16 changed files with 53 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flaim/m4/flm_ftk_search.m4
View File

@@ -14,7 +14,7 @@
# FTK_INCLUDE are linker and preprocessor command-line options.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-22
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_FTK_SEARCH],
@@ -22,8 +22,8 @@ AC_DEFUN([FLM_FTK_SEARCH],
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") || \
(test -n "$FTKINC" && test -z "$FTKLIB"); then
if { test -n "$FTKLIB" && test -z "$FTKINC"; } || \
{ test -n "$FTKINC" && test -z "$FTKLIB"; } then
AC_MSG_ERROR([Specify both FTKINC and FTKLIB, or neither.])
fi

11
flaim/m4/flm_prog_try_doxygen.m4
View File

@@ -16,15 +16,14 @@
# @DOXYGEN@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_DOXYGEN],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
ifelse([$1],,
[AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen])
m4_if([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
AC_MSG_WARN([doxygen not found - continuing without Doxygen support])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])# FLM_PROG_TRY_DOXYGEN

11
ftk/m4/flm_prog_try_doxygen.m4
View File

@@ -16,15 +16,14 @@
# @DOXYGEN@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_DOXYGEN],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
ifelse([$1],,
[AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen])
m4_if([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
AC_MSG_WARN([doxygen not found - continuing without Doxygen support])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])# FLM_PROG_TRY_DOXYGEN

6
sql/m4/flm_ftk_search.m4
View File

@@ -14,7 +14,7 @@
# FTK_INCLUDE are linker and preprocessor command-line options.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-22
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_FTK_SEARCH],
@@ -22,8 +22,8 @@ AC_DEFUN([FLM_FTK_SEARCH],
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") || \
(test -n "$FTKINC" && test -z "$FTKLIB"); then
if { test -n "$FTKLIB" && test -z "$FTKINC"; } || \
{ test -n "$FTKINC" && test -z "$FTKLIB"; } then
AC_MSG_ERROR([Specify both FTKINC and FTKLIB, or neither.])
fi

11
sql/m4/flm_prog_try_doxygen.m4
View File

@@ -16,15 +16,14 @@
# @DOXYGEN@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_DOXYGEN],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
ifelse([$1],,
[AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen])
m4_if([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
AC_MSG_WARN([doxygen not found - continuing without Doxygen support])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])# FLM_PROG_TRY_DOXYGEN

6
xflaim/m4/flm_ftk_search.m4
View File

@@ -14,7 +14,7 @@
# FTK_INCLUDE are linker and preprocessor command-line options.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-22
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_FTK_SEARCH],
@@ -22,8 +22,8 @@ AC_DEFUN([FLM_FTK_SEARCH],
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") || \
(test -n "$FTKINC" && test -z "$FTKLIB"); then
if { test -n "$FTKLIB" && test -z "$FTKINC"; } || \
{ test -n "$FTKINC" && test -z "$FTKLIB"; } then
AC_MSG_ERROR([Specify both FTKINC and FTKLIB, or neither.])
fi

7
xflaim/m4/flm_prog_try_csc.m4
View File

@@ -18,13 +18,12 @@
# @CSC@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_CSC],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([CSC], [CSharp compiler])dnl
AC_CHECK_PROGS([CSC], [mcs$EXEEXT csc$EXEEXT])
[AC_ARG_VAR([CSC], [CSharp compiler])dnl
AC_CHECK_PROGS([CSC], [mcs csc])
ifelse([$1],,
[if test -z "$CSC"; then
AC_MSG_WARN([CSharp compiler not found - continuing without CSharp])

7
xflaim/m4/flm_prog_try_csvm.m4
View File

@@ -15,13 +15,12 @@
# @CSVM@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_CSVM],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([CSVM], [CSharp virtual machine])dnl
AC_CHECK_PROGS([CSVM], [mono$EXEEXT cs$EXEEXT])
[AC_ARG_VAR([CSVM], [CSharp virtual machine])dnl
AC_CHECK_PROGS([CSVM], [mono cs])
ifelse([$1],,
[if test -z "$CSVM"; then
AC_MSG_WARN([CSharp VM not found - continuing without CSharp VM])

11
xflaim/m4/flm_prog_try_doxygen.m4
View File

@@ -16,15 +16,14 @@
# @DOXYGEN@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_DOXYGEN],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
ifelse([$1],,
[AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
AC_CHECK_PROGS([DOXYGEN], [doxygen])
m4_if([$1],,
[if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
AC_MSG_WARN([doxygen not found - continuing without Doxygen support])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])# FLM_PROG_TRY_DOXYGEN

7
xflaim/m4/flm_prog_try_jar.m4
View File

@@ -15,13 +15,12 @@
# @JAR@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_JAR],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([JAR], [Java archive utility])dnl
AC_CHECK_PROGS([JAR], [fastjar$EXEEXT jar$EXEEXT])
[AC_ARG_VAR([JAR], [Java archive utility])dnl
AC_CHECK_PROGS([JAR], [fastjar jar])
ifelse([$1],,
[if test -z "$JAR"; then
AC_MSG_WARN([Java ARchive program not found - continuing without jar])

7
xflaim/m4/flm_prog_try_java.m4
View File

@@ -15,13 +15,12 @@
# @JAVA@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_JAVA],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([JAVA], [Java virtual machine])dnl
AC_CHECK_PROGS([JAVA], [kaffe$EXEEXT java$EXEEXT])
[AC_ARG_VAR([JAVA], [Java virtual machine])dnl
AC_CHECK_PROGS([JAVA], [kaffe java])
ifelse([$1],,
[if test -z "$JAVA"; then
AC_MSG_WARN([Java VM not found - continuing without JVM])

7
xflaim/m4/flm_prog_try_javac.m4
View File

@@ -15,13 +15,12 @@
# @JAVAC@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_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])
[AC_ARG_VAR([JAVAC], [Java compiler])dnl
AC_CHECK_PROGS([JAVAC], ["gcj -C" guavac jikes javac])
ifelse([$1],,
[if test -z "$JAVAC"; then
AC_MSG_WARN([Java compiler not found - continuing without javac])

7
xflaim/m4/flm_prog_try_javadoc.m4
View File

@@ -15,13 +15,12 @@
# @JAVADOC@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_JAVADOC],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([JAVADOC], [Java source documentation utility])dnl
AC_CHECK_PROGS([JAVADOC], [gjdoc$EXEEXT javadoc$EXEEXT])
[AC_ARG_VAR([JAVADOC], [Java source documentation utility])dnl
AC_CHECK_PROGS([JAVADOC], [gjdoc javadoc])
ifelse([$1],,
[if test -z "$JAVADOC"; then
AC_MSG_WARN([Javadoc program not found - continuing without javadoc])

7
xflaim/m4/flm_prog_try_javah.m4
View File

@@ -15,13 +15,12 @@
# @JAVAH@.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_JAVAH],
[AC_REQUIRE([AC_EXEEXT])dnl
AC_ARG_VAR([JAVAH], [Java header utility])dnl
AC_CHECK_PROGS([JAVAH], [gcjh$EXEEXT javah$EXEEXT])
[AC_ARG_VAR([JAVAH], [Java header utility])dnl
AC_CHECK_PROGS([JAVAH], [gcjh javah])
ifelse([$1],,
[if test -z "$JAVAH"; then
AC_MSG_WARN([Java header program not found - continuing without javah])

5
xflaim/m4/flm_prog_try_jni.m4
View File

@@ -22,12 +22,11 @@
# files with @JAVAC@, @JAVAH@, and @JAR@, respectively.
#
# Author: John Calcote <john.calcote@gmail.com>
# Modified: 2009-04-27
# Modified: 2009-08-30
# License: AllPermissive
#
AC_DEFUN([FLM_PROG_TRY_JNI],
[AC_REQUIRE([AC_EXEEXT])dnl
FLM_PROG_TRY_JAVAC([quiet])dnl
[FLM_PROG_TRY_JAVAC([quiet])dnl
FLM_PROG_TRY_JAVAH([quiet])dnl
FLM_PROG_TRY_JAR([quiet])dnl
ifelse([$1],,

2
xflaim/src/cs/wrapper/Makefile.am
View File

@@ -67,7 +67,7 @@ uninstall-local:
rm -f "$(DESTDIR)$(docdir)/xflaim_csharp.xml"
xflaim_csharp.dll: $(xfcs_sources)
@list1='$+'; list2=; if test -n "$$list1"; then \
@list1='$?'; list2=; if test -n "$$list1"; then \
for p in $$list1; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
list2="$$list2 $$d$$p"; \