/[pcre]/code/trunk/configure.ac
ViewVC logotype

Diff of /code/trunk/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 479 by ph10, Sun Jan 3 16:31:39 2010 UTC revision 491 by ph10, Mon Mar 1 17:45:08 2010 UTC
# Line 1  Line 1 
1  dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
2    
3  dnl NOTE FOR MAINTAINERS: Do not use major or minor version numbers with  dnl NOTE FOR MAINTAINERS: Do not use minor version numbers 08 or 09 because
4  dnl leading zeros, because they may be treated as octal constants. The  dnl the leading zeros may cause them to be treated as invalid octal constants
5  dnl PCRE_PRERELEASE feature is for identifying release candidates. It might  dnl if a PCRE user writes code that uses PCRE_MINOR as a number. There is now
6  dnl be defined as -RC2, for example. For real releases, it should be defined  dnl a check further down that throws an error if 08 or 09 are used.
7  dnl empty.  
8    dnl The PCRE_PRERELEASE feature is for identifying release candidates. It might
9    dnl be defined as -RC2, for example. For real releases, it should be empty.
10    
11  m4_define(pcre_major, [8])  m4_define(pcre_major, [8])
12  m4_define(pcre_minor, [01])  m4_define(pcre_minor, [02])
13  m4_define(pcre_prerelease, [-RC1])  m4_define(pcre_prerelease, [-RC1])
14  m4_define(pcre_date, [2010-01-02])  m4_define(pcre_date, [2010-03-01])
15    
16  # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
17  m4_define(libpcre_version, [0:1:0])  m4_define(libpcre_version, [0:1:0])
# Line 82  PCRE_MINOR="pcre_minor" Line 84  PCRE_MINOR="pcre_minor"
84  PCRE_PRERELEASE="pcre_prerelease"  PCRE_PRERELEASE="pcre_prerelease"
85  PCRE_DATE="pcre_date"  PCRE_DATE="pcre_date"
86    
87    if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09"
88    then
89      echo "***"
90      echo "*** Minor version number $PCRE_MINOR must not be used. ***"
91      echo "*** Use only 01 to 07 or 10 onwards, to avoid octal issues. ***"
92      echo "***"
93      exit 1
94    fi
95    
96  AC_SUBST(PCRE_MAJOR)  AC_SUBST(PCRE_MAJOR)
97  AC_SUBST(PCRE_MINOR)  AC_SUBST(PCRE_MINOR)
98  AC_SUBST(PCRE_PRERELEASE)  AC_SUBST(PCRE_PRERELEASE)
# Line 329  AC_CHECK_HEADERS(bits/type_traits.h, [pc Line 340  AC_CHECK_HEADERS(bits/type_traits.h, [pc
340  AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],  AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],
341                                  [pcre_have_type_traits="0"])                                  [pcre_have_type_traits="0"])
342    
343    # (This isn't c++-specific, but is only used in pcrecpp.cc, so try this
344    # in a c++ context.  This matters becuase strtoimax is C99 and may not
345    # be supported by the C++ compiler.)
346    # Figure out how to create a longlong from a string: strtoll and
347    # equiv.  It's not enough to call AC_CHECK_FUNCS: hpux has a
348    # strtoll, for instance, but it only takes 2 args instead of 3!
349    # We have to call AH_TEMPLATE since AC_DEFINE_UNQUOTED below is complex.
350    AH_TEMPLATE(HAVE_STRTOQ, [Define to 1 if you have `strtoq'.])
351    AH_TEMPLATE(HAVE_STRTOLL, [Define to 1 if you have `strtoll'.])
352    AH_TEMPLATE(HAVE__STRTOI64, [Define to 1 if you have `_strtoi64'.])
353    AH_TEMPLATE(HAVE_STRTOIMAX, [Define to 1 if you have `strtoimax'.])
354    have_strto_fn=0
355    for fn in srtoq strtoll _strtoi64 strtoimax; do
356      AC_MSG_CHECKING([for $fn])
357      if test "$fn" = strtoimax; then
358        include=stdint.h
359      else
360        include=stdlib.h
361      fi
362      AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <$include>],
363                                        [char* e; return $fn("100", &e, 10)]),
364                        [AC_MSG_RESULT(yes)
365                         AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,
366                                            [Define to 1 if you have `$fn'.])
367                         have_strto_fn=1
368                         break],
369                        [AC_MSG_RESULT(no)])
370    done
371    
372    if test "$have_strto_fn" = 1; then
373      AC_CHECK_TYPES([long long],
374                     [pcre_have_long_long="1"],
375                     [pcre_have_long_long="0"])
376      AC_CHECK_TYPES([unsigned long long],
377                     [pcre_have_ulong_long="1"],
378                     [pcre_have_ulong_long="0"])
379    else
380      pcre_have_long_long="0"
381      pcre_have_ulong_long="0"
382    fi
383    AC_SUBST(pcre_have_long_long)
384    AC_SUBST(pcre_have_ulong_long)
385    
386  AC_LANG_POP  AC_LANG_POP
387  fi  fi
388  # Using AC_SUBST eliminates the need to include config.h in a public .h file  # Using AC_SUBST eliminates the need to include config.h in a public .h file
# Line 344  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, Line 398  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES,
398  AC_C_CONST  AC_C_CONST
399  AC_TYPE_SIZE_T  AC_TYPE_SIZE_T
400    
 pcre_have_strotolonglong=0  
 AC_CHECK_FUNCS(strtoq strtoll _strtoi64, [pcre_have_strotolonglong="1"; break])  
 # If we can't convert a string to a long long, pretend we don't even  
 # have a long long.  
 if test $pcre_have_strotolonglong = "0"; then  
    pcre_have_long_long="0"  
    pcre_have_ulong_long="0"  
 else  
   AC_CHECK_TYPES([long long],  
                  [pcre_have_long_long="1"],  
                  [pcre_have_long_long="0"])  
   AC_CHECK_TYPES([unsigned long long],  
                  [pcre_have_ulong_long="1"],  
                  [pcre_have_ulong_long="0"])  
 fi  
 AC_SUBST(pcre_have_long_long)  
 AC_SUBST(pcre_have_ulong_long)  
   
401  # Checks for library functions.  # Checks for library functions.
402    
403  AC_CHECK_FUNCS(bcopy memmove strerror)  AC_CHECK_FUNCS(bcopy memmove strerror)

Legend:
Removed from v.479  
changed lines
  Added in v.491

  ViewVC Help
Powered by ViewVC 1.1.5