Changeset 1713


Ignore:
Timestamp:
Nov 3, 2010 12:36:02 AM (9 years ago)
Author:
stefan
Message:

sync with trunk: lou's changes in comments

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6/coin.m4

    r1712 r1713  
    23072307###########################################################################
    23082308
    2309 # This macro checks for the libz library.
    2310 # If found, it sets the automake conditional COIN_HAS_ZLIB and defines the C preprocessor variable COIN_HAS_ZLIB.
    2311 # Further, for a (space separated) list of arguments X, it adds the linker flag to the variables X_LIBS and X_PCLIBS.
     2309# This macro checks for the libz library.  If found, it sets the automake
     2310# conditional COIN_HAS_ZLIB and defines the C preprocessor variable
     2311# COIN_HAS_ZLIB.  Further, for a (space separated) list of arguments X,
     2312# it adds the linker flag to the variables X_LIBS and X_PCLIBS.
    23122313
    23132314AC_DEFUN([AC_COIN_CHECK_GNU_ZLIB],
     
    23462347###########################################################################
    23472348
    2348 # This macro checks for the libbz2 library.
    2349 # If found, it defines the C preprocessor variable COIN_HAS_BZLIB.
    2350 # Further, for a (space separated) list of arguments X, it adds the linker flag to the variables X_LIBS and X_PCLIBS.
     2349# This macro checks for the libbz2 library.  If found, it defines the C
     2350# preprocessor variable COIN_HAS_BZLIB.  Further, for a (space separated) list
     2351# of arguments X, it adds the linker flag to the variables X_LIBS and X_PCLIBS.
    23512352
    23522353AC_DEFUN([AC_COIN_CHECK_GNU_BZLIB],
     
    24712472  AC_MSG_ERROR(Directory $m4_toupper(COIN_DATA_$1_PATH) does not exist)
    24722473fi
    2473 ]) # AC_COIN_HAS_DATA
     2474]) # AC_COIN_DATA_PATH
    24742475
    24752476###########################################################################
     
    27922793
    27932794###########################################################################
    2794 #                      COIN_CHECK_USER_LIBRARY (deprecated)               #
    2795 ###########################################################################
    2796 
    2797 AC_DEFUN([AC_COIN_HAS_USER_LIBRARY], [AC_COIN_CHECK_USER_LIBRARY([$1],[$2], [$3], [$4], [$5], [$6])])
     2795#                       COIN_HAS_USER_LIBRARY (deprecated)                #
     2796###########################################################################
     2797
     2798AC_DEFUN([AC_COIN_HAS_USER_LIBRARY],
     2799         [AC_COIN_CHECK_USER_LIBRARY([$1],[$2], [$3], [$4], [$5], [$6])])
    27982800
    27992801###########################################################################
     
    35813583###########################################################################
    35823584
    3583 # This macro checks whether a pkg-config tool with a minimal version number is available.
    3584 # If so, then the variable PKGCONFIG is set to its path.
    3585 # If not, PKGCONFIG is set to "".
    3586 # The minimal version number can be given as first parameter, by default it is 0.9.0.
    3587 # This macro is a modified version of PKG_PROG_PKG_CONFIG in pkg.m4
    3588 #
    3589 # Further, the AM_CONDITIONAL COIN_HAS_PKGCONFIG is set and PKGCONFIG is AC_SUBST'ed.
    3590 # Finally, if this setup belongs to a project directory, then the search path for .pc files
    3591 # is assembled from the value of $PKG_CONFIG_PATH, the values of --prefix, --coin-instdir,
    3592 # and the directory named in a file ../coin_subdirs.txt or ../../coin_subdirs.txt in a variable
    3593 # COIN_PKG_CONFIG_PATH, which is also AC_SUBST'ed.
     3585# This macro checks whether a pkg-config tool with a minimal version number
     3586# is available.  If so, then the variable PKGCONFIG is set to its path.
     3587# If not, PKGCONFIG is set to "".  The minimal version number can be given
     3588# as first parameter, by default it is 0.9.0.  This macro is a modified
     3589# version of PKG_PROG_PKG_CONFIG in pkg.m4.  Further, the AM_CONDITIONAL
     3590# COIN_HAS_PKGCONFIG is set and PKGCONFIG is AC_SUBST'ed.  Finally, if this
     3591# setup belongs to a project directory, then the search path for .pc files
     3592# is assembled from the value of $PKG_CONFIG_PATH, the values of --prefix,
     3593# --coin-instdir, and the directory named in a file ../coin_subdirs.txt
     3594# or ../../coin_subdirs.txt in a variable COIN_PKG_CONFIG_PATH, which is
     3595# also AC_SUBST'ed.
    35943596
    35953597AC_DEFUN([AC_COIN_HAS_PKGCONFIG],
     
    40514053###########################################################################
    40524054
    4053 # This macro is used by COIN_CHECK_PACKAGE, if it fails to find a package because pkg-config was disabled or is not available.
     4055# This macro is used by COIN_CHECK_PACKAGE, if it fails to find a package
     4056# because pkg-config was disabled or is not available.
    40544057#
    4055 # For each project xxx specified in $2, it searches for a xxx-uninstalled.pc file in the directories specified in
    4056 # $COIN_PKG_CONFIG_PATH_UNINSTALLED. The latter variable is setup by COIN_HAS_PKGCONFIG and
    4057 # consists of the content of the coin_subdirs.txt file which has been created by configure in the base directory.
    4058 # The content of xxx-uninstalled.pc is parsed in order to defines the variables PACKAGE_CFLAGS, PACKAGE_LIBS, and PACKAGE_DATA,
    4059 # referring to the compiler and linker flags to use when linking against this package
    4060 # and the directory where the package data resists.
    4061 # Further, for each build target X specified in the third argument, the variables X_CFLAGS and X_LIBS are
    4062 # extended with the compiler and linker flags of this package and the variables X_PCLIBS and X_PCREQUIRES are extended by the list
    4063 # of linker flags and dependent projects as needed to setup a .pc file.
    4064 # The macros checks also dependencies of $2.
    4065 # Note that the PACKAGE_DATA variable is set to the content of datadir of the first .pc file that is parsed.
     4058# For each project xxx specified in $2, it searches for a xxx-uninstalled.pc
     4059# file in the directories specified in $COIN_PKG_CONFIG_PATH_UNINSTALLED. The
     4060# latter variable is setup by COIN_HAS_PKGCONFIG and consists of the content
     4061# of the coin_subdirs.txt file which has been created by configure in the
     4062# base directory.  The content of xxx-uninstalled.pc is parsed in order
     4063# to defines the variables PACKAGE_CFLAGS, PACKAGE_LIBS, and PACKAGE_DATA,
     4064# referring to the compiler and linker flags to use when linking against this
     4065# package and the directory where the package data resists.  Further, for each
     4066# build target X specified in the third argument, the variables X_CFLAGS and
     4067# X_LIBS are extended with the compiler and linker flags of this package and
     4068# the variables X_PCLIBS and X_PCREQUIRES are extended by the list of linker
     4069# flags and dependent projects as needed to setup a .pc file.  The macros
     4070# checks also dependencies of $2.  Note that the PACKAGE_DATA variable is
     4071# set to the content of datadir of the first .pc file that is parsed.
    40664072#
    4067 # If .pc files for all projects in $2 and their dependencies is found, tolower(coin_has_$1) is set to "yes".
    4068 # Otherwise, if some dependency is not found, tolower(coin_has_$1) is set to "notGiven".
    4069 # Further, a COIN_HAS_PACKAGE preprocessor macro and a makefile conditional are defined.
     4073# If .pc files for all projects in $2 and their dependencies is found,
     4074# tolower(coin_has_$1) is set to "yes".  Otherwise, if some dependency
     4075# is not found, tolower(coin_has_$1) is set to "notGiven".  Further, a
     4076# COIN_HAS_PACKAGE preprocessor macro and a makefile conditional are defined.
    40704077#
    4071 # The first argument should be the name (PACKAGE) of the package (in correct lower and upper case).
    4072 # The second argument should be the base names of the projects .pc file which define this package.
    4073 # The optional third argument should be a (space separated) list of build targets
    4074 # which use this package, if available.
    4075 
    4076 # $1 is not checked for $COIN_SKIP_PROJECTS, since we only look into $COIN_PKG_CONFIG_PATH_UNINSTALLED.
    4077 # When the content of this variable was setup in the base directory, $COIN_SKIP_PROJECTS has already been considered.
     4078# The first argument should be the name (PACKAGE) of the package (in correct
     4079# lower and upper case).  The second argument should be the base names of the
     4080# projects .pc file which define this package.  The optional third argument
     4081# should be a (space separated) list of build targets which use this package,
     4082# if available.
     4083#
     4084# $1 is not checked for $COIN_SKIP_PROJECTS, since we only look into
     4085# $COIN_PKG_CONFIG_PATH_UNINSTALLED.  When the content of this variable was
     4086# setup in the base directory, $COIN_SKIP_PROJECTS has already been considered.
    40784087
    40794088AC_DEFUN([AC_COIN_CHECK_PACKAGE_FALLBACK],
     
    42024211# 1. checks the --with-blas argument
    42034212# 2. if --with-blas=BUILD has been specified goes to point 5
    4204 # 3. if --with-blas has been specified to a working library, sets BLAS_LIBS to its value
     4213# 3. if --with-blas has been specified to a working library, sets BLAS_LIBS
     4214#    to its value
    42054215# 4. tries standard libraries
    4206 # 5. calls COIN_CHECK_PACKAGE(Blas, [coinblas], [$1]) to check for ThirdParty/Blas
     4216# 5. calls COIN_CHECK_PACKAGE(Blas, [coinblas], [$1]) to check for
     4217#    ThirdParty/Blas
    42074218# The makefile conditional and preprocessor macro COIN_HAS_BLAS is defined.
    42084219# BLAS_LIBS is set to the flags required to link with a Blas library.
     
    42184229            [use_blas="$withval"], [use_blas=])
    42194230
    4220 #if user specified --with-blas-lib, then we should give COIN_HAS_PACKAGE preference
     4231# if user specified --with-blas-lib, then we should give COIN_HAS_PACKAGE
     4232# preference
    42214233AC_ARG_WITH([blas-lib],,[use_blas=BUILD])
    42224234
     
    43444356# 1. checks the --with-lapack argument
    43454357# 2. if --with-lapack=BUILD has been specified goes to point 5
    4346 # 3. if --with-lapack has been specified to a working library, sets LAPACK_LIBS to its value
     4358# 3. if --with-lapack has been specified to a working library, sets
     4359#    LAPACK_LIBS to its value
    43474360# 4. tries standard libraries
    4348 # 5. calls COIN_CHECK_PACKAGE(Lapack, [lapack], [$1]) to check for ThirdParty/Lapack
     4361# 5. calls COIN_CHECK_PACKAGE(Lapack, [lapack], [$1]) to check for
     4362#    ThirdParty/Lapack
    43494363# The makefile conditional and preprocessor macro COIN_HAS_LAPACK is defined.
    43504364# LAPACK_LIBS is set to the flags required to link with a Lapack library.
Note: See TracChangeset for help on using the changeset viewer.