PennMUSH Community

Changeset 1271

Show
Ignore:
Timestamp:
09/17/08 05:07:45 (3 months ago)
Author:
shawnw
Message:

Update some autoconf macros

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/aclocal.m4

    r1179 r1271  
    33# Namely, CHECK_SSL. 
    44 
    5 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
    6 # 2005  Free Software Foundation, Inc. 
    7 # This file is free software; the Free Software Foundation 
    8 # gives unlimited permission to copy and/or distribute it, 
    9 # with or without modifications, as long as this notice is preserved. 
    10  
    11 # This program is distributed in the hope that it will be useful, 
    12 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without 
    13 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
    14 # PARTICULAR PURPOSE. 
    15  
     5 
     6# =========================================================================== 
     7#              http://autoconf-archive.cryp.to/ax_lib_mysql.html 
     8# =========================================================================== 
    169# 
    1710# SYNOPSIS 
    …… 
    2114# DESCRIPTION 
    2215# 
    23 #   This macro provides tests of availability of MySQL client library 
    24 #   of particular version or newer. 
    25 # 
    26 #   AX_LIB_MYSQL macro takes only one argument which is optional. If 
    27 #   there is no required version passed, then macro does not run 
    28 #   version test. 
     16#   This macro provides tests of availability of MySQL client library of 
     17#   particular version or newer. 
     18# 
     19#   AX_LIB_MYSQL macro takes only one argument which is optional. If there 
     20#   is no required version passed, then macro does not run version test. 
    2921# 
    3022#   The --with-mysql option takes one of three possible values: 
    …… 
    3224#   no - do not check for MySQL client library 
    3325# 
    34 #   yes - do check for MySQL library in standard locations 
    35 #   (mysql_config should be in the PATH) 
     26#   yes - do check for MySQL library in standard locations (mysql_config 
     27#   should be in the PATH) 
    3628# 
    3729#   path - complete path to mysql_config utility, use this option if 
    …… 
    5042# LAST MODIFICATION 
    5143# 
    52 #   2006-07-16 
     44#   2008-04-12 
    5345# 
    5446# COPYLEFT 
    5547# 
    56 #   Copyright (c) 2006 Mateusz Loskot <mateusz@loskot.net> 
    57 # 
    58 #   Copying and distribution of this file, with or without 
    59 #   modification, are permitted in any medium without royalty provided 
    60 #   the copyright notice and this notice are preserved. 
     48#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net> 
     49# 
     50#   Copying and distribution of this file, with or without modification, are 
     51#   permitted in any medium without royalty provided the copyright notice 
     52#   and this notice are preserved. 
    6153 
    6254AC_DEFUN([AX_LIB_MYSQL], 
    …… 
    9385        fi 
    9486 
    95         AC_MSG_CHECKING([for MySQL libraries]) 
    9687        if test "$MYSQL_CONFIG" != "no"; then 
     88            AC_MSG_CHECKING([for MySQL libraries]) 
    9789 
    9890            MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" 
    …… 
    108100        else 
    109101            found_mysql="no" 
    110             AC_MSG_RESULT([no]) 
     102dnl            AC_MSG_RESULT([no]) 
    111103        fi 
    112104    fi 
    …… 
    263255]) 
    264256 
    265 ##### http://autoconf-archive.cryp.to/type_socklen_t.html 
     257# =========================================================================== 
     258#             http://autoconf-archive.cryp.to/type_socklen_t.html 
     259# =========================================================================== 
    266260# 
    267261# SYNOPSIS 
    …… 
    271265# DESCRIPTION 
    272266# 
    273 #   Check whether sys/socket.h defines type socklen_t. Please note that 
    274 #   some systems require sys/types.h to be included before sys/socket.h 
    275 #   can be compiled. 
     267#   Check whether sys/socket.h defines type socklen_t. Please note that some 
     268#   systems require sys/types.h to be included before sys/socket.h can be 
     269#   compiled. 
    276270# 
    277271# LAST MODIFICATION 
    278272# 
    279 #   2005-01-11 
     273#   2008-04-12 
    280274# 
    281275# COPYLEFT 
    282276# 
    283 #   Copyright (c) 2005 Lars Brinkhoff <lars@nocrew.org> 
    284 # 
    285 #   This program is free software; you can redistribute it and/or 
    286 #   modify it under the terms of the GNU General Public License as 
    287 #   published by the Free Software Foundation; either version 2 of the 
    288 #   License, or (at your option) any later version. 
     277#   Copyright (c) 2008 Lars Brinkhoff <lars@nocrew.org> 
     278# 
     279#   This program is free software; you can redistribute it and/or modify it 
     280#   under the terms of the GNU General Public License as published by the 
     281#   Free Software Foundation; either version 2 of the License, or (at your 
     282#   option) any later version. 
    289283# 
    290284#   This program is distributed in the hope that it will be useful, but 
    291285#   WITHOUT ANY WARRANTY; without even the implied warranty of 
    292 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
    293 #   General Public License for more details. 
    294 # 
    295 #   You should have received a copy of the GNU General Public License 
    296 #   along with this program; if not, write to the Free Software 
    297 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
    298 #   02111-1307, USA. 
    299 # 
    300 #   As a special exception, the respective Autoconf Macro's copyright 
    301 #   owner gives unlimited permission to copy, distribute and modify the 
    302 #   configure scripts that are the output of Autoconf when processing 
    303 #   the Macro. You need not follow the terms of the GNU General Public 
    304 #   License when using or distributing such scripts, even though 
    305 #   portions of the text of the Macro appear in them. The GNU General 
    306 #   Public License (GPL) does govern all other use of the material that 
    307 #   constitutes the Autoconf Macro. 
    308 # 
    309 #   This special exception to the GPL applies to versions of the 
    310 #   Autoconf Macro released by the Autoconf Macro Archive. When you 
    311 #   make and distribute a modified version of the Autoconf Macro, you 
    312 #   may extend this special exception to the GPL to apply to your 
    313 #   modified version as well. 
     286#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
     287#   Public License for more details. 
     288# 
     289#   You should have received a copy of the GNU General Public License along 
     290#   with this program. If not, see <http://www.gnu.org/licenses/>. 
     291# 
     292#   As a special exception, the respective Autoconf Macro's copyright owner 
     293#   gives unlimited permission to copy, distribute and modify the configure 
     294#   scripts that are the output of Autoconf when processing the Macro. You 
     295#   need not follow the terms of the GNU General Public License when using 
     296#   or distributing such scripts, even though portions of the text of the 
     297#   Macro appear in them. The GNU General Public License (GPL) does govern 
     298#   all other use of the material that constitutes the Autoconf Macro. 
     299# 
     300#   This special exception to the GPL applies to versions of the Autoconf 
     301#   Macro released by the Autoconf Macro Archive. When you make and 
     302#   distribute a modified version of the Autoconf Macro, you may extend this 
     303#   special exception to the GPL to apply to your modified version as well. 
    314304 
    315305AC_DEFUN([TYPE_SOCKLEN_T], 
    …… 
    328318]) 
    329319 
    330  
    331 ##### http://autoconf-archive.cryp.to/lib_socket_nsl.html 
     320# =========================================================================== 
     321#             http://autoconf-archive.cryp.to/lib_socket_nsl.html 
     322# =========================================================================== 
    332323# 
    333324# SYNOPSIS 
    …… 
    337328# DESCRIPTION 
    338329# 
    339 #   This macro figures out what libraries are required on this platform 
    340 #   to link sockets programs. 
     330#   This macro figures out what libraries are required on this platform to 
     331#   link sockets programs. 
    341332# 
    342333#   The common cases are not to need any extra libraries, or to need 
    343 #   -lsocket and -lnsl. We need to avoid linking with libnsl unless we 
    344 #   need it, though, since on some OSes where it isn't necessary it 
    345 #   will totally break networking. Unisys also includes gethostbyname() 
    346 #   in libsocket but needs libnsl for socket(). 
     334#   -lsocket and -lnsl. We need to avoid linking with libnsl unless we need 
     335#   it, though, since on some OSes where it isn't necessary it will totally 
     336#   break networking. Unisys also includes gethostbyname() in libsocket but 
     337#   needs libnsl for socket(). 
    347338# 
    348339# LAST MODIFICATION 
    349340# 
    350 #   2005-09-06 
     341#   2008-04-12 
    351342# 
    352343# COPYLEFT 
    353344# 
    354 #   Copyright (c) 2005 Russ Allbery <rra@stanford.edu> 
    355 #   Copyright (c) 2005 Stepan Kasal <kasal@ucw.cz> 
    356 #   Copyright (c) 2005 Warren Young <warren@etr-usa.com> 
    357 # 
    358 #   Copying and distribution of this file, with or without 
    359 #   modification, are permitted in any medium without royalty provided 
    360 #   the copyright notice and this notice are preserved. 
     345#   Copyright (c) 2008 Russ Allbery <rra@stanford.edu> 
     346#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz> 
     347#   Copyright (c) 2008 Warren Young <warren@etr-usa.com> 
     348# 
     349#   Copying and distribution of this file, with or without modification, are 
     350#   permitted in any medium without royalty provided the copyright notice 
     351#   and this notice are preserved. 
    361352 
    362353AC_DEFUN([LIB_SOCKET_NSL], 
    …… 
    368359]) 
    369360 
    370 ##### http://autoconf-archive.cryp.to/ac_func_snprintf.html 
     361 
     362# =========================================================================== 
     363#            http://autoconf-archive.cryp.to/ac_func_snprintf.html 
     364# =========================================================================== 
    371365# 
    372366# SYNOPSIS 
    …… 
    376370# DESCRIPTION 
    377371# 
    378 #   Checks for a fully C99 compliant snprintf, in particular checks 
    379 #   whether it does bounds checking and returns the correct string 
    380 #   length; does the same check for vsnprintf. If no working snprintf 
    381 #   or vsnprintf is found, request a replacement and warn the user 
    382 #   about it. Note: the mentioned replacement is freely available and 
    383 #   may be used in any project regardless of it's license. 
     372#   Checks for a fully C99 compliant snprintf, in particular checks whether 
     373#   it does bounds checking and returns the correct string length; does the 
     374#   same check for vsnprintf. If no working snprintf or vsnprintf is found, 
     375#   request a replacement and warn the user about it. Note: the mentioned 
     376#   replacement is freely available and may be used in any project 
     377#   regardless of it's license. 
    384378# 
    385379# LAST MODIFICATION 
    386380# 
    387 #   2006-10-18 
     381#   2008-04-12 
    388382# 
    389383# COPYLEFT 
    390384# 
    391 #   Copyright (c) 2006 Rüdiger Kuhlmann <info@ruediger-kuhlmann.de> 
    392 # 
    393 #   Copying and distribution of this file, with or without 
    394 #   modification, are permitted in any medium without royalty provided 
    395 #   the copyright notice and this notice are preserved. 
     385#   Copyright (c) 2008 Rüdiger Kuhlmann <info@ruediger-kuhlmann.de> 
     386# 
     387#   Copying and distribution of this file, with or without modification, are 
     388#   permitted in any medium without royalty provided the copyright notice 
     389#   and this notice are preserved. 
    396390 
    397391AC_DEFUN([AC_FUNC_SNPRINTF], 
    …… 
    451445  AC_DEFINE(PREFER_PORTABLE_SNPRINTF, 1, "enable replacement (v)snprintf if system (v)snprintf is broken") 
    452446fi]) 
    453 ##### http://autoconf-archive.cryp.to/ax_lib_postgresql.html 
     447 
     448# =========================================================================== 
     449#           http://autoconf-archive.cryp.to/ax_lib_postgresql.html 
     450# =========================================================================== 
    454451# 
    455452# SYNOPSIS 
    …… 
    459456# DESCRIPTION 
    460457# 
    461 #   This macro provides tests of availability of PostgreSQL 'libpq' 
    462 #   library of particular version or newer. 
    463 # 
    464 #   AX_LIB_POSTGRESQL macro takes only one argument which is optional. 
    465 #   If there is no required version passed, then macro does not run 
    466 #   version test. 
     458#   This macro provides tests of availability of PostgreSQL 'libpq' library 
     459#   of particular version or newer. 
     460# 
     461#   AX_LIB_POSTGRESQL macro takes only one argument which is optional. If 
     462#   there is no required version passed, then macro does not run version 
     463#   test. 
    467464# 
    468465#   The --with-postgresql option takes one of three possible values: 
    …… 
    470467#   no - do not check for PostgreSQL client library 
    471468# 
    472 #   yes - do check for PostgreSQL library in standard locations 
    473 #   (pg_config should be in the PATH) 
    474 # 
    475 #   path - complete path to pg_config utility, use this option if 
    476 #   pg_config can't be found in the PATH 
     469#   yes - do check for PostgreSQL library in standard locations (pg_config 
     470#   should be in the PATH) 
     471# 
     472#   path - complete path to pg_config utility, use this option if pg_config 
     473#   can't be found in the PATH 
    477474# 
    478475#   This macro calls: 
    …… 
    488485# LAST MODIFICATION 
    489486# 
    490 #   2006-07-16 
     487#   2008-04-12 
    491488# 
    492489# COPYLEFT 
    493490# 
    494 #   Copyright (c) 2006 Mateusz Loskot <mateusz@loskot.net> 
    495 # 
    496 #   Copying and distribution of this file, with or without 
    497 #   modification, are permitted in any medium without royalty provided 
    498 #   the copyright notice and this notice are preserved. 
     491#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net> 
     492# 
     493#   Copying and distribution of this file, with or without modification, are 
     494#   permitted in any medium without royalty provided the copyright notice 
     495#   and this notice are preserved. 
    499496 
    500497AC_DEFUN([AX_LIB_POSTGRESQL], 
    …… 
    519516    POSTGRESQL_CFLAGS="" 
    520517    POSTGRESQL_LDFLAGS="" 
    521     POSTGRESQL_POSTGRESQL="" 
     518    POSTGRESQL_VERSION="" 
    522519 
    523520    dnl 
    …… 
    528525 
    529526        if test -z "$PG_CONFIG" -o test; then 
    530             AC_PATH_PROG([PG_CONFIG], [pg_config], [no]) 
    531         fi 
    532  
    533         AC_MSG_CHECKING([for PostgreSQL libraries]) 
     527            AC_PATH_PROG([PG_CONFIG], [pg_config], []) 
     528        fi 
     529 
     530        if test ! -x "$PG_CONFIG"; then 
     531            PG_CONFIG="no" 
     532            found_postgresql="no" 
     533        fi 
     534 
    534535        if test "$PG_CONFIG" != "no"; then 
     536            AC_MSG_CHECKING([for PostgreSQL libraries]) 
    535537 
    536538            POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`" 
    …… 
    546548        else 
    547549            found_postgresql="no" 
    548             AC_MSG_RESULT([no]) 
     550dnl            AC_MSG_RESULT([no]) 
    549551        fi 
    550552    fi 
    …… 
    599601    AC_SUBST([POSTGRESQL_LDFLAGS]) 
    600602]) 
    601 ##### http://autoconf-archive.cryp.to/ax_lib_sqlite3.html 
     603 
     604 
     605# =========================================================================== 
     606#             http://autoconf-archive.cryp.to/ax_lib_sqlite3.html 
     607# =========================================================================== 
    602608# 
    603609# SYNOPSIS 
    …… 
    609615#   Test for the SQLite 3 library of a particular version (or newer) 
    610616# 
    611 #   This macro takes only one optional argument, required version of 
    612 #   SQLite 3 library. If required version is not passed, 3.0.0 is used 
    613 #   in the test of existance of SQLite 3. 
    614 # 
    615 #   If no intallation prefix to the installed SQLite library is given 
    616 #   the macro searches under /usr, /usr/local, and /opt. 
     617#   This macro takes only one optional argument, required version of SQLite 
     618#   3 library. If required version is not passed, 3.0.0 is used in the test 
     619#   of existance of SQLite 3. 
     620# 
     621#   If no intallation prefix to the installed SQLite library is given the 
     622#   macro searches under /usr, /usr/local, and /opt. 
    617623# 
    618624#   This macro calls: 
    …… 
    628634# LAST MODIFICATION 
    629635# 
    630 #   2006-07-15 
     636#   2008-04-12 
    631637# 
    632638# COPYLEFT 
    633639# 
    634 #   Copyright (c) 2006 Mateusz Loskot <mateusz@loskot.net> 
    635 # 
    636 #   Copying and distribution of this file, with or without 
    637 #   modification, are permitted in any medium without royalty provided 
    638 #   the copyright notice and this notice are preserved. 
     640#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net> 
     641# 
     642#   Copying and distribution of this file, with or without modification, are 
     643#   permitted in any medium without royalty provided the copyright notice 
     644#   and this notice are preserved. 
    639645 
    640646AC_DEFUN([AX_LIB_SQLITE3], 
    …… 
    701707        saved_CPPFLAGS="$CPPFLAGS" 
    702708        CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags" 
     709 
     710        AC_LANG_PUSH(C++) 
    703711        AC_COMPILE_IFELSE( 
    704712            [ 
    …… 
    706714                [[ 
    707715#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number) 
    708 /* Everything is okay */ 
     716// Everything is okay 
    709717#else 
    710718#  error SQLite version is too old 
    …… 
    722730            ] 
    723731        ) 
     732        AC_LANG_POP([C++]) 
    724733 
    725734        CPPFLAGS="$saved_CPPFLAGS" 
    …… 
    747756            AC_SUBST(SQLITE3_LDFLAGS) 
    748757            AC_SUBST(SQLITE3_VERSION) 
    749             AC_DEFINE(HAVE_SQLITE3) 
     758            AC_DEFINE([HAVE_SQLITE3], [], [Have the SQLITE3 library]) 
    750759        fi 
    751760    fi 
    752761]) 
    753 ##### http://autoconf-archive.cryp.to/ax_c___attribute__.html 
     762 
     763# =========================================================================== 
     764#           http://autoconf-archive.cryp.to/ax_c___attribute__.html 
     765# =========================================================================== 
    754766# 
    755767# SYNOPSIS 
    …… 
    759771# DESCRIPTION 
    760772# 
    761 #   Provides a test for the compiler support of __attribute__ 
    762 #   extensions. defines HAVE___ATTRIBUTE__ if it is found. 
    763 # 
    764 #   Originating from the 'pork' package by Ryan McCabe <ryan@numb.org> 
     773#   Provides a test for the compiler support of __attribute__ extensions. 
     774#   Defines HAVE___ATTRIBUTE__ if it is found. 
    765775# 
    766776# LAST MODIFICATION 
    767777# 
    768 #   2005-01-21 
     778#   2008-04-12 
    769779# 
    770780# COPYLEFT 
    771781# 
    772 #   Copyright (c) 2005 Christian Haggstrom <chm@c00.info> 
    773 # 
    774 #   This program is free software; you can redistribute it and/or 
    775 #   modify it under the terms of the GNU General Public License as 
    776 #   published by the Free Software Foundation; either version 2 of the 
    777 #   License, or (at your option) any later version. 
     782#   Copyright (c) 2008 Stepan Kasal <skasal@redhat.com> 
     783#   Copyright (c) 2008 Christian Haggstrom 
     784#   Copyright (c) 2008 Ryan McCabe <ryan@numb.org> 
     785# 
     786#   This program is free software; you can redistribute it and/or modify it 
     787#   under the terms of the GNU General Public License as published by the 
     788#   Free Software Foundation; either version 2 of the License, or (at your 
     789#   option) any later version. 
    778790# 
    779791#   This program is distributed in the hope that it will be useful, but 
    780792#   WITHOUT ANY WARRANTY; without even the implied warranty of 
    781 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
    782 #   General Public License for more details. 
    783 # 
    784 #   You should have received a copy of the GNU General Public License 
    785 #   along with this program; if not, write to the Free Software 
    786 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
    787 #   02111-1307, USA. 
    788 # 
    789 #   As a special exception, the respective Autoconf Macro's copyright 
    790 #   owner gives unlimited permission to copy, distribute and modify the 
    791 #   configure scripts that are the output of Autoconf when processing 
    792 #   the Macro. You need not follow the terms of the GNU General Public 
    793 #   License when using or distributing such scripts, even though 
    794 #   portions of the text of the Macro appear in them. The GNU General 
    795 #   Public License (GPL) does govern all other use of the material that 
    796 #   constitutes the Autoconf Macro. 
    797 # 
    798 #   This special exception to the GPL applies to versions of the 
    799 #   Autoconf Macro released by the Autoconf Macro Archive. When you 
    800 #   make and distribute a modified version of the Autoconf Macro, you 
    801 #   may extend this special exception to the GPL to apply to your 
    802 #   modified version as well. 
    803  
    804 AC_DEFUN([AX_C___ATTRIBUTE__],  
    805   [AC_MSG_CHECKING(for __attribute__) 
    806   AC_CACHE_VAL(ac_cv___attribute__, [ 
    807     AC_TRY_COMPILE( 
    808       [#include <stdlib.h> 
    809       static void foo(void) __attribute__ ((unused)); 
    810       static void 
    811       foo(void) { 
    812           exit(1); 
    813       }],, 
    814       ac_cv___attribute__=yes, 
    815       ac_cv___attribute__=no 
    816     )]) 
    817   if test "$ac_cv___attribute__" = "yes"; then 
    818     AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__]) 
     793#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
     794#   Public License for more details. 
     795# 
     796#   You should have received a copy of the GNU General Public License along 
     797#   with this program. If not, see <http://www.gnu.org/licenses/>. 
     798# 
     799#   As a special exception, the respective Autoconf Macro's copyright owner 
     800#   gives unlimited permission to copy, distribute and modify the configure 
     801#   scripts that are the output of Autoconf when processing the Macro. You 
     802#   need not follow the terms of the GNU General Public License when using 
     803#   or distributing such scripts, even though portions of the text of the 
     804#   Macro appear in them. The GNU General Public License (GPL) does govern 
     805#   all other use of the material that constitutes the Autoconf Macro. 
     806# 
     807#   This special exception to the GPL applies to versions of the Autoconf 
     808#   Macro released by the Autoconf Macro Archive. When you make and 
     809#   distribute a modified version of the Autoconf Macro, you may extend this 
     810#   special exception to the GPL to apply to your modified version as well. 
     811 
     812AC_DEFUN([AX_C___ATTRIBUTE__], [ 
     813  AC_CACHE_CHECK([for __attribute__], [ax_cv___attribute__], 
     814    [AC_COMPILE_IFELSE( 
     815      [AC_LANG_PROGRAM( 
     816    [[#include <stdlib.h> 
     817      static void foo(void) __attribute__ ((unused)); 
     818      static void 
     819      foo(void) { 
     820          exit(1); 
     821      } 
     822        ]], [])], 
     823      [ax_cv___attribute__=yes], 
     824      [ax_cv___attribute__=no] 
     825    ) 
     826  ]) 
     827  if test "$ax_cv___attribute__" = "yes"; then 
     828    AC_DEFINE([HAVE___ATTRIBUTE__], 1, [define if your compiler has __attribute__]) 
    819829  fi 
    820   AC_MSG_RESULT($ac_cv___attribute__) 
    821 ]) 
    822 ##### http://autoconf-archive.cryp.to/ax_gcc_malloc_call.html 
     830]) 
     831 
     832 
     833# =========================================================================== 
     834#           http://autoconf-archive.cryp.to/ax_gcc_malloc_call.html 
     835# =========================================================================== 
    823836# 
    824837# SYNOPSIS 
    …… 
    828841# DESCRIPTION 
    829842# 
    830 #   The macro will compile a test program to see whether the compiler 
    831 #   does understand the per-function postfix pragma. 
     843#   The macro will compile a test program to see whether the compiler does 
     844#   understand the per-function postfix pragma. 
    832845# 
    833846# LAST MODIFICATION 
    834847# 
    835 #   2006-08-10 
     848#   2008-04-12 
    836849# 
    837850# COPYLEFT 
    838851# 
    839 #   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de> 
    840 # 
    841 #   This program is free software; you can redistribute it and/or 
    842 #   modify it under the terms of the GNU General Public License as 
    843 #   published by the Free Software Foundation; either version 2 of the 
    844 #   License, or (at your option) any later version. 
     852#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> 
     853# 
     854#   This program is free software; you can redistribute it and/or modify it 
     855#   under the terms of the GNU General Public License as published by the 
     856#   Free Software Foundation; either version 2 of the License, or (at your 
     857#   option) any later version. 
    845858# 
    846859#   This program is distributed in the hope that it will be useful, but 
    847860#   WITHOUT ANY WARRANTY; without even the implied warranty of 
    848 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
    849 #   General Public License for more details. 
    850 # 
    851 #   You should have received a copy of the GNU General Public License 
    852 #   along with this program; if not, write to the Free Software 
    853 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
    854 #   02111-1307, USA. 
    855 # 
    856 #   As a special exception, the respective Autoconf Macro's copyright 
    857 #   owner gives unlimited permission to copy, distribute and modify the 
    858 #   configure scripts that are the output of Autoconf when processing 
    859 #   the Macro. You need not follow the terms of the GNU General Public 
    860 #   License when using or distributing such scripts, even though 
    861 #   portions of the text of the Macro appear in them. The GNU General 
    862 #   Public License (GPL) does govern all other use of the material that 
    863 #   constitutes the Autoconf Macro. 
    864 # 
    865 #   This special exception to the GPL applies to versions of the 
    866 #   Autoconf Macro released by the Autoconf Macro Archive. When you 
    867 #   make and distribute a modified version of the Autoconf Macro, you 
    868 #   may extend this special exception to the GPL to apply to your 
    869 #   modified version as well. 
     861#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
     862#   Public License for more details. 
     863# 
     864#   You should have received a copy of the GNU General Public License along 
     865#   with this program. If not, see <http://www.gnu.org/licenses/>. 
     866# 
     867#   As a special exception, the respective Autoconf Macro's copyright owner 
     868#   gives unlimited permission to copy, distribute and modify the configure 
     869#   scripts that are the output of Autoconf when processing the Macro. You 
     870#   need not follow the terms of the GNU General Public License when using 
     871#   or distributing such scripts, even though portions of the text of the 
     872#   Macro appear in them. The GNU General Public License (GPL) does govern 
     873#   all other use of the material that constitutes the Autoconf Macro. 
     874# 
     875#   This special exception to the GPL applies to versions of the Autoconf 
     876#   Macro released by the Autoconf Macro Archive. When you make and 
     877#   distribute a modified version of the Autoconf Macro, you may extend this 
     878#   special exception to the GPL to apply to your modified version as well. 
    870879 
    871880AC_DEFUN([AX_GCC_MALLOC_CALL],[dnl 
    …… 
    882891 fi 
    883892]) 
    884 ##### http://autoconf-archive.cryp.to/ax_path_lib_pcre.html 
     893 
     894 
     895# =========================================================================== 
     896#             http://autoconf-archive.cryp.to/ax_gcc_option.html 
     897# =========================================================================== 
    885898# 
    886899# SYNOPSIS 
    887900# 
    888 #   AX_PATH_LIB_PCRE [(A/NA)] 
     901#   AX_GCC_OPTION(OPTION,EXTRA-OPTIONS,TEST-PROGRAM,ACTION-IF-SUCCESSFUL,ACTION-IF-NOT-SUCCESFUL) 
    889902# 
    890903# DESCRIPTION 
    891904# 
    892 #   check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly. 
    893 # 
    894 #   also provide --with-pcre option that may point to the $prefix of 
    895 #   the pcre installation - the macro will check $pcre/include and 
    896 #   $pcre/lib to contain the necessary files. 
    897 # 
    898 #   the usual two ACTION-IF-FOUND / ACTION-IF-NOT-FOUND are supported 
    899 #   and they can take advantage of the LIBS/CFLAGS additions. 
    900 # 
    901 # LAST MODIFICATION 
    902 # 
    903 #   2006-10-13 
    904 # 
    905 # COPYLEFT 
    906 # 
    907 #   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de> 
    908 # 
    909 #   This program is free software; you can redistribute it and/or 
    910 #   modify it under the terms of the GNU General Public License as 
    911 #   published by the Free Software Foundation; either version 2 of the 
    912 #   License, or (at your option) any later version. 
    913 # 
    914 #   This program is distributed in the hope that it will be useful, but 
    915 #   WITHOUT ANY WARRANTY; without even the implied warranty of 
    916 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
    917 #   General Public License for more details. 
    918 # 
    919 #   You should have received a copy of the GNU General Public License 
    920 #   along with this program; if not, write to the Free Software 
    921 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
    922 #   02111-1307, USA. 
    923 # 
    924 #   As a special exception, the respective Autoconf Macro's copyright 
    925 #   owner gives unlimited permission to copy, distribute and modify the 
    926 #   configure scripts that are the output of Autoconf when processing 
    927 #   the Macro. You need not follow the terms of the GNU General Public 
    928 #   License when using or distributing such scripts, even though 
    929 #   portions of the text of the Macro appear in them. The GNU General 
    930 #   Public License (GPL) does govern all other use of the material that 
    931 #   constitutes the Autoconf Macro. 
    932 # 
    933 #   This special exception to the GPL applies to versions of the 
    934 #   Autoconf Macro released by the Autoconf Macro Archive. When you 
    935 #   make and distribute a modified version of the Autoconf Macro, you 
    936 #   may extend this special exception to the GPL to apply to your 
    937 #   modified version as well. 
    938  
    939 AC_DEFUN([AX_PATH_LIB_PCRE],[dnl 
    940 AC_MSG_CHECKING([lib pcre]) 
    941 AC_ARG_WITH(pcre, 
    942 [  --with-pcre[[=prefix]]    path to system pcre],, 
    943      with_pcre="yes") 
    944 if test ".$with_pcre" = ".no" ; then 
    945   AC_MSG_RESULT([disabled]) 
    946   m4_ifval($2,$2) 
    947 else 
    948   AC_MSG_RESULT([(testing)]) 
    949   AC_CHECK_LIB(pcre, pcre_study) 
    950   if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then 
    951      PCRE_LIBS="-lpcre" 
    952      AC_MSG_CHECKING([lib pcre]) 
    953      AC_MSG_RESULT([$PCRE_LIBS]) 
    954      m4_ifval($1,$1) 
    955   else 
    956      OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib" 
    957      OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include" 
    958      OLDLIBS="$LIBS" 
    959      AC_CHECK_LIB(pcre, pcre_compile) 
    960      CPPFLAGS="$OLDCPPFLAGS" 
    961      LDFLAGS="$OLDLDFLAGS" 
    962      LIBS="$OLDLIBS" 
    963      if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then 
    964         AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre) 
    965         PCRE_LIBS="-L$with_pcre/lib -lpcre" 
    966         test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include" 
    967         AC_MSG_CHECKING([lib pcre]) 
    968         AC_MSG_RESULT([$PCRE_LIBS]) 
    969         m4_ifval($1,$1) 
    970      else 
    971         AC_MSG_CHECKING([lib pcre]) 
    972         AC_MSG_RESULT([no, (WARNING)]) 
    973         m4_ifval($2,$2) 
    974      fi 
    975   fi 
    976 fi 
    977 AC_SUBST([PCRE_LIBS]) 
    978 AC_SUBST([PCRE_CFLAGS]) 
    979 ]) 
    980 ##### http://autoconf-archive.cryp.to/ax_gcc_option.html 
    981 # 
    982 # SYNOPSIS 
    983 # 
    984 #   AX_GCC_OPTION(OPTION,EXTRA-OPTIONS,TEST-PROGRAM,ACTION-IF-SUCCESSFUL,ACTION-IF-NOT-SUCCESFUL) 
    985 # 
    986 # DESCRIPTION 
    987 # 
    988 #   AX_GCC_OPTION checks wheter gcc accepts the passed OPTION. If it 
    989 #   accepts the OPTION then ACTION-IF-SUCCESSFUL will be executed, 
    990 #   otherwise ACTION-IF-UNSUCCESSFUL. 
    991 # 
    992 #   NOTE: This macro will be obsoleted by AX_C_CHECK_FLAG 
    993 #   AX_CXX_CHECK_FLAG, AX_CPP_CHECK_FLAG, AX_CXXCPP_CHECK_FLAG and 
    994 #   AX_LD_CHECK_FLAG. 
     905#   AX_GCC_OPTION checks wheter gcc accepts the passed OPTION. If it accepts 
     906#   the OPTION then ACTION-IF-SUCCESSFUL will be executed, otherwise 
     907#   ACTION-IF-UNSUCCESSFUL. 
     908# 
     909#   NOTE: This macro will be obsoleted by AX_C_CHECK_FLAG AX_CXX_CHECK_FLAG, 
     910#   AX_CPP_CHECK_FLAG, AX_CXXCPP_CHECK_FLAG and AX_LD_CHECK_FLAG. 
    995911# 
    996912#   A typical usage should be the following one: 
    …… 
    1001917#     ]) 
    1002918# 
    1003 #   The macro doesn't discriminate between languages so, if you are 
    1004 #   testing for an option that works for C++ but not for C you should 
    1005 #   use '-x c++' as EXTRA-OPTIONS: 
     919#   The macro doesn't discriminate between languages so, if you are testing 
     920#   for an option that works for C++ but not for C you should use '-x c++' 
     921#   as EXTRA-OPTIONS: 
    1006922# 
    1007923#     AX_GCC_OPTION([-fno-rtti],[-x c++],[],[ ... ],[ ... ]) 
    …… 
    1014930#     } 
    1015931# 
    1016 #   The optional TEST-PROGRAM comes handy when the default main() is 
    1017 #   not suited for the option being checked 
     932#   The optional TEST-PROGRAM comes handy when the default main() is not 
     933#   suited for the option being checked 
    1018934# 
    1019935#   So, if you need to test for -fstrict-prototypes option you should 
    …… 
    1030946#     ],[ ... ],[ ... ]) 
    1031947# 
    1032 #   Note that the macro compiles but doesn't link the test program so 
    1033 #   it is not suited for checking options that are passed to the 
    1034 #   linker, like: 
     948#   Note that the macro compiles but doesn't link the test program so it is 
     949#   not suited for checking options that are passed to the linker, like: 
    1035950# 
    1036951#     -Wl,-L<a-library-path> 
    1037952# 
    1038 #   In order to avoid such kind of problems you should think about 
    1039 #   usinguse the AX_*_CHECK_FLAG family macros 
     953#   In order to avoid such kind of problems you should think about usinguse 
     954#   the AX_*_CHECK_FLAG family macros 
    1040955# 
    1041956# LAST MODIFICATION 
    1042957# 
    1043 #   2007-11-26 
     958#   2008-04-12 
    1044959# 
    1045960# COPYLEFT 
    1046961# 
    1047 #   Copyright (c) 2007 Francesco Salvestrini <salvestrini@users.sourceforge.net> 
    1048 #   Copyright (c) 2007 Bogdan Drozdowski <bogdandr@op.pl> 
    1049 # 
    1050 #   This program is free software; you can redistribute it and/or 
    1051 #   modify it under the terms of the GNU General Public License as 
    1052 #   published by the Free Software Foundation; either version 2 of the 
    1053 #   License, or (at your option) any later version. 
     962#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net> 
     963#   Copyright (c) 2008 Bogdan Drozdowski <bogdandr@op.pl> 
     964# 
     965#   This program is free software; you can redistribute it and/or modify it 
     966#   under the terms of the GNU General Public License as published by the 
     967#   Free Software Foundation; either version 2 of the License, or (at your 
     968#   option) any later version. 
    1054969# 
    1055970#   This program is distributed in the hope that it will be useful, but 
    1056971#   WITHOUT ANY WARRANTY; without even the implied warranty of 
    1057 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
    1058 #   General Public License for more details. 
    1059 # 
    1060 #   You should have received a copy of the GNU General Public License 
    1061 #   along with this program; if not, write to the Free Software 
    1062 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
    1063 #   02111-1307, USA. 
    1064 # 
    1065 #   As a special exception, the respective Autoconf Macro's copyright 
    1066 #   owner gives unlimited permission to copy, distribute and modify the 
    1067 #   configure scripts that are the output of Autoconf when processing 
    1068 #   the Macro. You need not follow the terms of the GNU General Public 
    1069 #   License when using or distributing such scripts, even though 
    1070 #   portions of the text of the Macro appear in them. The GNU General 
    1071 #   Public License (GPL) does govern all other use of the material that 
    1072 #   constitutes the Autoconf Macro. 
    1073 # 
    1074 #   This special exception to the GPL applies to versions of the 
    1075 #   Autoconf Macro released by the Autoconf Macro Archive. When you 
    1076 #   make and distribute a modified version of the Autoconf Macro, you 
    1077 #   may extend this special exception to the GPL to apply to your 
    1078 #   modified version as well. 
     972#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
     973#   Public License for more details. 
     974# 
     975#   You should have received a copy of the GNU General Public License along 
     976#   with this program. If not, see <http://www.gnu.org/licenses/>. 
     977# 
     978#   As a special exception, the respective Autoconf Macro's copyright owner 
     979#   gives unlimited permission to copy, distribute and modify the configure 
     980#   scripts that are the output of Autoconf when processing the Macro. You 
     981#   need not follow the terms of the GNU General Public License when using 
     982#   or distributing such scripts, even though portions of the text of the 
     983#   Macro appear in them. The GNU General Public License (GPL) does govern 
     984#   all other use of the material that constitutes the Autoconf Macro. 
     985# 
     986#   This special exception to the GPL applies to versions of the Autoconf 
     987#   Macro released by the Autoconf Macro Archive. When you make and 
     988#   distribute a modified version of the Autoconf Macro, you may extend this 
     989#   special exception to the GPL to apply to your modified version as well. 
    1079990 
    1080991AC_DEFUN([AX_GCC_OPTION], [ 
    …… 
    11121023  ]) 
    11131024]) 
     1025 
     1026# =========================================================================== 
     1027#              http://autoconf-archive.cryp.to/ax_with_perl.html 
     1028# =========================================================================== 
     1029# 
     1030# SYNOPSIS 
     1031# 
     1032#   AX_WITH_PERL([VALUE-IF-NOT-FOUND],[PATH]) 
     1033# 
     1034# DESCRIPTION 
     1035# 
     1036#   Locates an installed Perl binary, placing the result in the precious 
     1037#   variable $PERL. Accepts a present $PERL, then --with-perl, and failing 
     1038#   that searches for perl in the given path (which defaults to the system 
     1039#   path). If perl is found, $PERL is set to the full path of the binary; if 
     1040#   it is not found $PERL is set to VALUE-IF-NOT-FOUND if provided, 
     1041#   unchanged otherwise. 
     1042# 
     1043#   A typical use could be the following one: 
     1044# 
     1045#         AX_WITH_PERL 
     1046# 
     1047# LAST MODIFICATION 
     1048# 
     1049#   2008-05-05 
     1050# 
     1051# COPYLEFT 
     1052# 
     1053#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net> 
     1054# 
     1055#   Copying and distribution of this file, with or without modification, are 
     1056#   permitted in any medium without royalty provided the copyright notice 
     1057#   and this notice are preserved. 
     1058 
     1059AC_DEFUN([AX_WITH_PERL],[ 
     1060    AX_WITH_PROG(PERL,perl,$1,$2) 
     1061]) 
     1062# =========================================================================== 
     1063#              http://autoconf-archive.cryp.to/ax_with_prog.html 
     1064# =========================================================================== 
     1065# 
     1066# SYNOPSIS 
     1067# 
     1068#   AX_WITH_PROG([VARIABLE],[program],[VALUE-IF-NOT-FOUND],[PATH]) 
     1069# 
     1070# DESCRIPTION 
     1071# 
     1072#   Locates an installed program binary, placing the result in the precious 
     1073#   variable VARIABLE. Accepts a present VARIABLE, then --with-program, and 
     1074#   failing that searches for program in the given path (which defaults to 
     1075#   the system path). If program is found, VARIABLE is set to the full path 
     1076#   of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND 
     1077#   if provided, unchanged otherwise. 
     1078# 
     1079#   A typical example could be the following one: 
     1080# 
     1081#         AX_WITH_PROG(PERL,perl) 
     1082# 
     1083#   NOTE: This macro is based upon the original AX_WITH_PYTHON macro from 
     1084#   Dustin J. Mitchell <dustin@cs.uchicago.edu>. 
     1085# 
     1086# LAST MODIFICATION 
     1087# 
     1088#   2008-05-05 
     1089# 
     1090# COPYLEFT 
     1091# 
     1092#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net> 
     1093#   Copyright (c) 2008 Dustin J. Mitchell <dustin@cs.uchicago.edu> 
     1094# 
     1095#   Copying and distribution of this file, with or without modification, are 
     1096#   permitted in any medium without royalty provided the copyright notice 
     1097#   and this notice are preserved. 
     1098 
     1099AC_DEFUN([AX_WITH_PROG],[ 
     1100    AC_PREREQ([2.61]) 
     1101 
     1102    pushdef([VARIABLE],$1) 
     1103    pushdef([EXECUTABLE],$2) 
     1104    pushdef([VALUE_IF_NOT_FOUND],$3) 
     1105    pushdef([PATH_PROG],$4) 
     1106 
     1107    AC_ARG_VAR(VARIABLE,Absolute path to EXECUTABLE executable) 
     1108 
     1109    AS_IF(test -z "$VARIABLE",[ 
     1110        AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) 
     1111        AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[[PATH]]]]],absolute path to EXECUTABLE executable), [ 
     1112        AS_IF([test "$withval" != "yes"],[ 
     1113            VARIABLE="$withval" 
     1114        AC_MSG_RESULT($VARIABLE) 
     1115        ],[ 
     1116        VARIABLE="" 
     1117            AC_MSG_RESULT([no]) 
     1118        ]) 
     1119    ],[ 
     1120        AC_MSG_RESULT([no]) 
     1121    ]) 
     1122 
     1123        AS_IF(test -z "$VARIABLE",[ 
     1124        AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) 
     1125        ]) 
     1126    ]) 
     1127 
     1128    popdef([PATH_PROG]) 
     1129    popdef([VALUE_IF_NOT_FOUND]) 
     1130    popdef([EXECUTABLE]) 
     1131    popdef([VARIABLE]) 
     1132]) 

  • 1.8.3/branches/devel/configure

    r1270 r1271  
    641641SQLITE3_LDFLAGS 
    642642SQLITE3_CFLAGS 
     643ac_ct_CXX 
     644CXXFLAGS 
     645CXX 
    643646POSTGRESQL_LDFLAGS 
    644647POSTGRESQL_CFLAGS 
    …… 
    649652MYSQL_VERSION 
    650653MYSQL_CONFIG 
    651 PCRE_CFLAGS 
    652 PCRE_LIBS 
    653654HAVE_SSL 
    654655EGREP 
    …… 
    726727ac_user_opts=' 
    727728enable_option_checking 
     729with_perl 
    728730with_ssl 
    729 with_pcre 
    730731enable_sql 
    731732with_mysql 
    …… 
    743744LIBS 
    744745CPPFLAGS 
     746PERL 
    745747SENDMAIL 
    746 CPP' 
     748CPP 
     749CXX 
     750CXXFLAGS 
     751CCC' 
    747752 
    748753 
    …… 
    13741379  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes] 
    13751380  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no) 
     1381  --with-perl=[[PATH]]  absolute path to perl executable 
    13761382 
    13771383  --with-ssl=[DIR]        look for OpenSSL in DIR (Use when it's not found 
    13781384                          with the default search path) 
    13791385 
    1380   --with-pcre[=prefix]    path to system pcre 
    13811386  --with-mysql=[ARG]      use MySQL client library [default=yes], optionally 
    13821387                          specify path to mysql_config 
    …… 
    13941399  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if 
    13951400              you have headers in a nonstandard directory <include dir> 
     1401  PERL        Absolute path to perl executable 
    13961402  SENDMAIL    Path to sendmail 
    13971403  CPP         C preprocessor 
     1404  CXX         C++ compiler command 
     1405  CXXFLAGS    C++ compiler flags 
    13981406 
    13991407Use these variables to override the choices made by `configure' or to help 
    …… 
    34123420 
    34133421 
    3414 # Extract the first word of "perl", so it can be a program name with args. 
     3422 
     3423 
     3424 
     3425 
     3426 
     3427 
     3428 
     3429 
     3430 
     3431 
     3432 
     3433    if test -z "$PERL"; then 
     3434 
     3435        { $as_echo "$as_me:$LINENO: checking whether perl executable path has been provided" >&5 
     3436$as_echo_n "checking whether perl executable path has been provided... " >&6; } 
     3437 
     3438# Check whether --with-perl was given. 
     3439if test "${with_perl+set}" = set; then 
     3440  withval=$with_perl; 
     3441        if test "$withval" != "yes"; then 
     3442 
     3443            PERL="$withval" 
     3444        { $as_echo "$as_me:$LINENO: result: $PERL" >&5 
     3445$as_echo "$PERL" >&6; } 
     3446 
     3447else 
     3448 
     3449        PERL="" 
     3450            { $as_echo