X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/blobdiff_plain/a80cb8cccac19ddc8196939a3084150b2e12b9e1..c85e070b575236e0d90befccfbc4237b6a606109:/aclocal.glob diff --git a/aclocal.glob b/aclocal.glob index 9fb8a2b..ba2a1ad 100644 --- a/aclocal.glob +++ b/aclocal.glob @@ -1,6 +1,6 @@ dnl -*-fundamental-*- *@--GLOB-HEADER--@* dnl -dnl $Id: aclocal.glob,v 1.4 1999/07/26 23:44:32 mdw Exp $ +dnl $Id: aclocal.glob,v 1.8 1999/11/26 01:23:17 mdw Exp $ dnl dnl Common library of autoconf macros dnl @@ -28,6 +28,18 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl----- Revision history --------------------------------------------------- dnl dnl $Log: aclocal.glob,v $ +dnl Revision 1.8 1999/11/26 01:23:17 mdw +dnl And support for MXD (not yet released). +dnl +dnl Revision 1.7 1999/11/11 20:03:58 mdw +dnl Add support for mgLib too. +dnl +dnl Revision 1.6 1999/11/11 17:49:33 mdw +dnl New macros for configuring clients of mLib and Catacomb. +dnl +dnl Revision 1.5 1999/07/27 18:27:37 mdw +dnl Fix typo in header line for mdw_DECL_ENVIRON. +dnl dnl Revision 1.4 1999/07/26 23:44:32 mdw dnl Reorder and tidy documentation. dnl @@ -43,7 +55,7 @@ dnl dnl----- Common files distribution --------------------------- *@--NOTICE--@* dnl -dnl $Id: aclocal.glob,v 1.4 1999/07/26 23:44:32 mdw Exp $ +dnl $Id: aclocal.glob,v 1.8 1999/11/26 01:23:17 mdw Exp $ dnl --- *@-AC_PROG_CC_STDC-@* --- dnl @@ -1063,7 +1075,7 @@ dnl dnl Use: Like `AC_REQUIRE', only it handles arguments. AC_DEFUN(mdw_REQUIRE, -[ifdef([AC_PROVIDED_$1], , +[ifdef([AC_PROVIDE_$1], , [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl indir($@) AC_DIVERT_POP()dnl @@ -1127,7 +1139,7 @@ if test $mdw_cv_ssize_t = no; then AC_DEFINE(ssize_t, int) fi]) -dnl --- *@-mdw-DECL_ENVIRON-@* --- +dnl --- *@-mdw_DECL_ENVIRON-@* --- dnl dnl Author: Mark Wooding dnl @@ -1348,6 +1360,161 @@ if test "$GXX" = "yes"; then CXXFLAGS="$CXXFLAGS ifelse([$3], [], [-fhandle-exceptions], [$3])" fi]) +dnl *@-mdw_MLIB-@* +dnl +dnl Author: Mark Wooding +dnl +dnl Synopsis: mdw_MLIB(VERSION, IF-FOUND, IF-NOT-FOUND +dnl +dnl Arguments: VERSION = version of library required +dnl IF-FOUND = what to do if found +dnl IF-NOT-FOUND = what to do if not found +dnl +dnl Use: Configures an mLib client program. The default +dnl version is 1.0.0pre0; the default action is to add +dnl everything to the CFLAGS and LIBS variables, and complain +dnl if the library couldn't be found. +dnl +dnl The variable MLIB_VERSION contains the version number of +dnl the library; MLIB_CFLAGS is the C compiler flags required +dnl and MLIB_LIBS is the linker flags. + +AC_DEFUN([mdw_MLIB], +[AC_MSG_CHECKING([for mLib library]) +if mLib-config --check $1 >/dev/null 2>&1; then + MLIB_VERSION=`mLib-config --version` + MLIB_CFLAGS=`mLib-config --cflags` + MLIB_LIBS=`mLib-config --libs` + AC_SUBST(MLIB_VERSION) AC_SUBST(MLIB_CFLAGS) AC_SUBST(MLIB_LIBS) + ifelse([$2], [], + [CFLAGS="$CFLAGS $MLIB_CFLAGS" + LIBS="$MLIB_LIBS $LIBS"], + $2) + AC_MSG_RESULT([$MLIB_VERSION]) +else + ifelse([$3], [], + AC_MSG_ERROR([mLib library not found or too old.]), + $3) + AC_MSG_RESULT([not found]) +fi]) + +dnl *@-mdw_MGLIB-@* +dnl +dnl Author: Mark Wooding +dnl +dnl Synopsis: mdw_MGLIB(VERSION, IF-FOUND, IF-NOT-FOUND +dnl +dnl Arguments: VERSION = version of library required +dnl IF-FOUND = what to do if found +dnl IF-NOT-FOUND = what to do if not found +dnl +dnl Use: Configures an mgLib client program. The default +dnl version is 1.0.0pre0; the default action is to add +dnl everything to the CFLAGS and LIBS variables, and complain +dnl if the library couldn't be found. +dnl +dnl The variable MGLIB_VERSION contains the version number of +dnl the library; MGLIB_CFLAGS is the C compiler flags required +dnl and MGLIB_LIBS is the linker flags. + +AC_DEFUN([mdw_MGLIB], +[mdw_REQUIRE([mdw_MGLIB], [1.6.0]) +AC_MSG_CHECKING([for mgLib library]) +if mgLib-config --check $1 >/dev/null 2>&1; then + MGLIB_VERSION=`mgLib-config --version` + MGLIB_CFLAGS=`mgLib-config --cflags` + MGLIB_LIBS=`mgLib-config --libs` + AC_SUBST(MGLIB_VERSION) AC_SUBST(MGLIB_CFLAGS) AC_SUBST(MGLIB_LIBS) + ifelse([$2], [], + [CFLAGS="$CFLAGS $MGLIB_CFLAGS" + LIBS="$MGLIB_LIBS $LIBS"], + $2) + AC_MSG_RESULT([$MGLIB_VERSION]) +else + ifelse([$3], [], + AC_MSG_ERROR([mgLib library not found or too old.]), + $3) + AC_MSG_RESULT([not found]) +fi]) + +dnl *@-mdw_MXD-@* +dnl +dnl Author: Mark Wooding +dnl +dnl Synopsis: mdw_MXD(VERSION, IF-FOUND, IF-NOT-FOUND +dnl +dnl Arguments: VERSION = version of library required +dnl IF-FOUND = what to do if found +dnl IF-NOT-FOUND = what to do if not found +dnl +dnl Use: Configures an MXD client program. The default +dnl version is 1.0.0pre0; the default action is to add +dnl everything to the CFLAGS and LIBS variables, and complain +dnl if the library couldn't be found. +dnl +dnl The variable MXD_VERSION contains the version number of +dnl the library; MXD_CFLAGS is the C compiler flags required +dnl and MXD_LIBS is the linker flags. + +AC_DEFUN([mdw_MXD], +[AC_MSG_CHECKING([for MXD library]) +if mxd-config --check $1 >/dev/null 2>&1; then + MXD_VERSION=`mxd-config --version` + MXD_CFLAGS=`mxd-config --cflags` + MXD_LIBS=`mxd-config --libs` + AC_SUBST(MXD_VERSION) AC_SUBST(MXD_CFLAGS) AC_SUBST(MXD_LIBS) + ifelse([$2], [], + [CFLAGS="$CFLAGS $MXD_CFLAGS" + LIBS="$MXD_LIBS $LIBS"], + $2) + AC_MSG_RESULT([$MXD_VERSION]) +else + ifelse([$3], [], + AC_MSG_ERROR([MXD library not found or too old.]), + $3) + AC_MSG_RESULT([not found]) +fi]) + +dnl *@-mdw_CATACOMB-@* +dnl +dnl Author: Mark Wooding +dnl +dnl Synopsis: mdw_CATACOMB([VERSION], [IF-FOUND], [IF-NOT-FOUND]) +dnl +dnl Arguments: VERSION = version of Catacomb required +dnl IF-FOUND = what to do if found +dnl IF-NOT-FOUND = what to do if not found +dnl +dnl Use: Configures the program as a Catacomb client. The default +dnl version is 1.0.0pre0; the default action is to add +dnl everything to the CFLAGS and LIBS variables, and complain +dnl if the library couldn't be found. +dnl +dnl The variable CATACOMB_VERSION contains the version number of +dnl the library; CATACOMB_CFLAGS is the C compiler flags required +dnl and CATACOMB_LIBS is the linker flags. + +AC_DEFUN([mdw_CATACOMB], +[mdw_REQUIRE([mdw_MLIB], [1.6.0]) +AC_MSG_CHECKING([for Catacomb library]) +if catacomb-config --check $1 >/dev/null 2>&1; then + CATACOMB_VERSION=`catacomb-config --version` + CATACOMB_CFLAGS=`catacomb-config --cflags` + CATACOMB_LIBS=`catacomb-config --libs` + AC_SUBST(CATACOMB_VERSION) + AC_SUBST(CATACOMB_CFLAGS) AC_SUBST(CATACOMB_LIBS) + ifelse([$2], [], + [CFLAGS="$CFLAGS $CATACOMB_CFLAGS" + LIBS="$CATACOMB_LIBS $LIBS"], + $2) + AC_MSG_RESULT([$CATACOMB_VERSION]) +else + ifelse([$3], [], + AC_MSG_ERROR([Catacomb library not found or too old.]), + $3) + AC_MSG_RESULT([not found]) +fi]) + dnl --- *@-mdw_OPT_NDEBUG-@* --- dnl dnl Author: Mark Wooding