/[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 145 by ph10, Wed Apr 4 14:06:52 2007 UTC revision 198 by ph10, Tue Jul 31 11:11:23 2007 UTC
# Line 7  dnl be defined as -RC2, for example. For Line 7  dnl be defined as -RC2, for example. For
7  dnl empty.  dnl empty.
8    
9  m4_define(pcre_major, [7])  m4_define(pcre_major, [7])
10  m4_define(pcre_minor, [1])  m4_define(pcre_minor, [3])
11  m4_define(pcre_prerelease, [-RC4])  m4_define(pcre_prerelease, [-RC2])
12  m4_define(pcre_date, [2007-04-04])  m4_define(pcre_date, [2007-07-31])
13    
14  # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
15  m4_define(libpcre_version, [0:1:0])  m4_define(libpcre_version, [0:1:0])
# Line 21  AC_INIT(PCRE, pcre_major.pcre_minor[]pcr Line 21  AC_INIT(PCRE, pcre_major.pcre_minor[]pcr
21  AC_CONFIG_SRCDIR([pcre.h.in])  AC_CONFIG_SRCDIR([pcre.h.in])
22  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
23  AC_CONFIG_HEADERS(config.h)  AC_CONFIG_HEADERS(config.h)
24    
25    # The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
26    # "-g" for any other compiler. There doesn't seem to be a standard way of
27    # getting rid of the -g (which I don't think is needed for a production
28    # library). This fudge seems to achieve the necessary. First, we remember the
29    # externally set values of CFLAGS and CXXFLAGS. Then call the AC_PROG_CC and
30    # AC_PROG_CXX macros to find the compilers - if CFLAGS and CXXFLAGS are not
31    # set, they will be set to Autoconf's defaults. Afterwards, if the original
32    # values were not set, remove the -g from the Autoconf defaults.
33    # (PH 02-May-07)
34    
35    remember_set_CFLAGS="$CFLAGS"
36    remember_set_CXXFLAGS="$CXXFLAGS"
37    
38  AC_PROG_CC  AC_PROG_CC
39  AC_PROG_CXX  AC_PROG_CXX
40    
41    if test "x$remember_set_CFLAGS" = "x"
42    then
43      if test "$CFLAGS" = "-g -O2"
44      then
45        CFLAGS="-O2"
46      elif test "$CFLAGS" = "-g"
47      then
48        CFLAGS=""
49      fi
50    fi
51    
52    if test "x$remember_set_CXXFLAGS" = "x"
53    then
54      if test "$CXXFLAGS" = "-g -O2"
55      then
56        CXXFLAGS="-O2"
57      elif test "$CXXFLAGS" = "-g"
58      then
59        CXXFLAGS=""
60      fi
61    fi
62    
63    
64  AC_PROG_INSTALL  AC_PROG_INSTALL
65  AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
66  AC_PROG_LIBTOOL  AC_PROG_LIBTOOL
# Line 71  AC_ARG_ENABLE(unicode-properties, Line 109  AC_ARG_ENABLE(unicode-properties,
109  # Handle --enable-newline=NL  # Handle --enable-newline=NL
110  dnl AC_ARG_ENABLE(newline,  dnl AC_ARG_ENABLE(newline,
111  dnl               AS_HELP_STRING([--enable-newline=NL],  dnl               AS_HELP_STRING([--enable-newline=NL],
112  dnl                              [use NL as newline (lf, cr, crlf, any; default=lf)]),  dnl                              [use NL as newline (lf, cr, crlf, anycrlf, any; default=lf)]),
113  dnl               , enable_newline=lf)  dnl               , enable_newline=lf)
114    
115  # Separate newline options  # Separate newline options
# Line 88  AC_ARG_ENABLE(newline-is-crlf, Line 126  AC_ARG_ENABLE(newline-is-crlf,
126                AS_HELP_STRING([--enable-newline-is-crlf],                AS_HELP_STRING([--enable-newline-is-crlf],
127                               [use CRLF as newline sequence]),                               [use CRLF as newline sequence]),
128                ac_pcre_newline=crlf)                ac_pcre_newline=crlf)
129    AC_ARG_ENABLE(newline-is-anycrlf,
130                  AS_HELP_STRING([--enable-newline-is-anycrlf],
131                                 [use CR, LF, or CRLF as newline sequence]),
132                  ac_pcre_newline=anycrlf)
133  AC_ARG_ENABLE(newline-is-any,  AC_ARG_ENABLE(newline-is-any,
134                AS_HELP_STRING([--enable-newline-is-any],                AS_HELP_STRING([--enable-newline-is-any],
135                               [use any valid Unicode newline sequence]),                               [use any valid Unicode newline sequence]),
# Line 97  enable_newline="$ac_pcre_newline" Line 139  enable_newline="$ac_pcre_newline"
139  # Handle --enable-ebcdic  # Handle --enable-ebcdic
140  AC_ARG_ENABLE(ebcdic,  AC_ARG_ENABLE(ebcdic,
141                AS_HELP_STRING([--enable-ebcdic],                AS_HELP_STRING([--enable-ebcdic],
142                               [assume EBCDIC coding rather than ASCII (implies --enable-rebuild-chartables)]),                               [assume EBCDIC coding rather than ASCII; use this only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]),
143                , enable_ebcdic=no)                , enable_ebcdic=no)
144    
145  # Handle --disable-stack-for-recursion  # Handle --disable-stack-for-recursion
# Line 163  fi Line 205  fi
205    
206  # Convert the newline identifier into the appropriate integer value.  # Convert the newline identifier into the appropriate integer value.
207  case "$enable_newline" in  case "$enable_newline" in
208    lf)   ac_pcre_newline_value=10   ;;    lf)      ac_pcre_newline_value=10   ;;
209    cr)   ac_pcre_newline_value=13   ;;    cr)      ac_pcre_newline_value=13   ;;
210    crlf) ac_pcre_newline_value=3338 ;;    crlf)    ac_pcre_newline_value=3338 ;;
211    any)  ac_pcre_newline_value=-1   ;;    anycrlf) ac_pcre_newline_value=-2   ;;
212      any)     ac_pcre_newline_value=-1   ;;
213    *)    *)
214    AC_MSG_ERROR([invalid argument \"$enable_newline\" to --enable-newline option])    AC_MSG_ERROR([invalid argument \"$enable_newline\" to --enable-newline option])
215    ;;    ;;
# Line 280  AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_ Line 323  AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_
323    The value of NEWLINE determines the newline character sequence. On    The value of NEWLINE determines the newline character sequence. On
324    Unix-like systems, "configure" can be used to override the default,    Unix-like systems, "configure" can be used to override the default,
325    which is 10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF),    which is 10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF),
326    or -1 (ANY).])    -1 (ANY), or -2 (ANYCRLF).])
327    
328  AC_DEFINE_UNQUOTED([LINK_SIZE], [$with_link_size], [  AC_DEFINE_UNQUOTED([LINK_SIZE], [$with_link_size], [
329    The value of LINK_SIZE determines the number of bytes used to store    The value of LINK_SIZE determines the number of bytes used to store

Legend:
Removed from v.145  
changed lines
  Added in v.198

  ViewVC Help
Powered by ViewVC 1.1.5