Changeset 738 for releases

Show
Ignore:
Timestamp:
09/05/05 19:12:13 (3 years ago)
Author:
aj
Message:

add / update all m4 macro packages we use.

Location:
releases/openct-0.6.6/aclocal
Files:
4 added
1 modified

Legend:

Unmodified
Added
Removed
  • releases/openct-0.6.6/aclocal/pkg.m4

    r635 r738  
     1# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*- 
     2#  
     3# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 
     4# 
     5# This program is free software; you can redistribute it and/or modify 
     6# it under the terms of the GNU General Public License as published by 
     7# the Free Software Foundation; either version 2 of the License, or 
     8# (at your option) any later version. 
     9# 
     10# This program is distributed in the hope that it will be useful, but 
     11# WITHOUT ANY WARRANTY; without even the implied warranty of 
     12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     13# General Public License for more details. 
     14# 
     15# You should have received a copy of the GNU General Public License 
     16# along with this program; if not, write to the Free Software 
     17# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
     18# 
     19# As a special exception to the GNU General Public License, if you 
     20# distribute this file as part of a program that contains a 
     21# configuration script generated by Autoconf, you may include it under 
     22# the same distribution terms that you use for the rest of that program. 
    123 
    2 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) 
    3 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page 
    4 dnl also defines GSTUFF_PKG_ERRORS on error 
    5 AC_DEFUN([PKG_CHECK_MODULES], [ 
    6   succeeded=no 
     24# PKG_PROG_PKG_CONFIG([MIN-VERSION]) 
     25# ---------------------------------- 
     26AC_DEFUN([PKG_PROG_PKG_CONFIG], 
     27[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 
     28m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) 
     29AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl 
     30if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 
     31        AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) 
     32fi 
     33if test -n "$PKG_CONFIG"; then 
     34        _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) 
     35        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) 
     36        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then 
     37                AC_MSG_RESULT([yes]) 
     38        else 
     39                AC_MSG_RESULT([no]) 
     40                PKG_CONFIG="" 
     41        fi 
     42                 
     43fi[]dnl 
     44])# PKG_PROG_PKG_CONFIG 
    745 
    8   if test -z "$PKG_CONFIG"; then 
    9     AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 
    10   fi 
     46# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 
     47# --------------------------------------------- 
     48m4_define([_PKG_CONFIG], 
     49[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then 
     50        pkg_cv_[]$1=$ac_cv_env_[]$1[]_value 
     51elif test -n "$PKG_CONFIG"; then 
     52        if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then 
     53                pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` 
     54        else 
     55                pkg_failed=yes 
     56        fi 
     57else 
     58        pkg_failed=untried 
     59fi[]dnl 
     60])# _PKG_CONFIG 
    1161 
    12   if test "$PKG_CONFIG" = "no" ; then 
    13      echo "*** The pkg-config script could not be found. Make sure it is" 
    14      echo "*** in your path, or set the PKG_CONFIG environment variable" 
    15      echo "*** to the full path to pkg-config." 
    16      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." 
    17   else 
    18      PKG_CONFIG_MIN_VERSION=0.9.0 
    19      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then 
    20         AC_MSG_CHECKING(for $2) 
     62# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 
     63# [ACTION-IF-NOT-FOUND]) 
     64# 
     65# 
     66# Note that if there is a possibility the first call to 
     67# PKG_CHECK_MODULES might not happen, you should be sure to include an 
     68# explicit call to PKG_PROG_PKG_CONFIG in your configure.in 
     69# 
     70# 
     71# -------------------------------------------------------------- 
     72AC_DEFUN([PKG_CHECK_MODULES], 
     73[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 
     74AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 
     75AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl 
    2176 
    22         if $PKG_CONFIG --exists "$2" ; then 
    23             AC_MSG_RESULT(yes) 
    24             succeeded=yes 
     77pkg_failed=no 
     78AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS], 
     79        [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])]) 
     80AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS], 
     81        [_PKG_CONFIG([$1][_LIBS], [libs], [$2])]) 
    2582 
    26             AC_MSG_CHECKING($1_CFLAGS) 
    27             $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` 
    28             AC_MSG_RESULT($$1_CFLAGS) 
     83if test $pkg_failed = yes; then 
     84        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` 
     85        # Put the nasty error message in config.log where it belongs 
     86        echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD 
    2987 
    30             AC_MSG_CHECKING($1_LIBS) 
    31             $1_LIBS=`$PKG_CONFIG --libs "$2"` 
    32             AC_MSG_RESULT($$1_LIBS) 
    33         else 
    34             $1_CFLAGS="" 
    35             $1_LIBS="" 
    36             ## If we have a custom action on failure, don't print errors, but  
    37             ## do set a variable so people can do so. 
    38             $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` 
    39             ifelse([$4], ,echo $$1_PKG_ERRORS,) 
    40         fi 
     88        ifelse([$4], , [AC_MSG_ERROR(dnl 
     89[Package requirements ($2) were not met. 
     90Consider adjusting the PKG_CONFIG_PATH environment variable if you 
     91installed software in a non-standard prefix. 
    4192 
    42         AC_SUBST($1_CFLAGS) 
    43         AC_SUBST($1_LIBS) 
    44      else 
    45         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." 
    46         echo "*** See http://www.freedesktop.org/software/pkgconfig" 
    47      fi 
    48   fi 
     93Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables 
     94to avoid the need to call pkg-config.  See the pkg-config man page for 
     95more details.])], 
     96                [$4]) 
     97elif test $pkg_failed = untried; then 
     98        ifelse([$4], , [AC_MSG_FAILURE(dnl 
     99[The pkg-config script could not be found or is too old.  Make sure it 
     100is in your PATH or set the PKG_CONFIG environment variable to the full 
     101path to pkg-config. 
    49102 
    50   if test $succeeded = yes; then 
    51      ifelse([$3], , :, [$3]) 
    52   else 
    53      ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) 
    54   fi 
    55 ]) 
     103Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables 
     104to avoid the need to call pkg-config.  See the pkg-config man page for 
     105more details. 
    56106 
    57  
     107To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], 
     108                [$4]) 
     109else 
     110        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS 
     111        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS 
     112        ifelse([$3], , :, [$3]) 
     113fi[]dnl 
     114])# PKG_CHECK_MODULES