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

Update try macros.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1090 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-04-22 20:10:27 +00:00
parent 3889810b62
commit 40fba2fbce
23 changed files with 442 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/configure.ac
View File

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

48
sql/m4/ac_prog_try_doxygen.m4
View File

@@ -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 <john.calcote@gmail.com>
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 <john.calcote@gmail.com>
# 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
])

11
sql/m4/flm_ftk_search.m4
View File

@@ -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 <john.calcote@gmail.com>
# 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") || \