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
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