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

Diff of /code/trunk/configure.in

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

revision 77 by nigel, Sat Feb 24 21:40:45 2007 UTC revision 79 by nigel, Sat Feb 24 21:40:52 2007 UTC
# Line 21  dnl digits for minor numbers less than 1 Line 21  dnl digits for minor numbers less than 1
21  dnl that many releases anyway.  dnl that many releases anyway.
22    
23  PCRE_MAJOR=6  PCRE_MAJOR=6
24  PCRE_MINOR=0  PCRE_MINOR=1
25  PCRE_DATE=07-Jun-2005  PCRE_DATE=21-Jun-2005
26  PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR}  PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR}
27    
28  dnl Default values for miscellaneous macros  dnl Default values for miscellaneous macros
# Line 44  dnl For the C++ wrapper libpcrecpp. Line 44  dnl For the C++ wrapper libpcrecpp.
44    
45  AC_PROG_CXX  AC_PROG_CXX
46    
 if test -n "$ac_cv_prog_ac_ct_CXX"; then  
   MAYBE_CPP_TARGETS='$(CPP_TARGETS)'  
 fi  
 echo "Maybe-cpp-targets: '$ac_cv_prog_CXX' '$MAYBE_CPP_TARGETS'" #!!  
 AC_SUBST(MAYBE_CPP_TARGETS)  
   
47  dnl The icc compiler has the same options as gcc, so let the rest of the  dnl The icc compiler has the same options as gcc, so let the rest of the
48  dnl configure script think it has gcc when setting up dnl options etc.  dnl configure script think it has gcc when setting up dnl options etc.
49  dnl This is a nasty hack which no longer seems necessary with the update  dnl This is a nasty hack which no longer seems necessary with the update
# Line 90  AC_LANG_CPLUSPLUS Line 84  AC_LANG_CPLUSPLUS
84  dnl I could be more clever here, given I'm doing AC_SUBST with this  dnl I could be more clever here, given I'm doing AC_SUBST with this
85  dnl (eg set a var to be the name of the include file I want).  But I'm not  dnl (eg set a var to be the name of the include file I want).  But I'm not
86  dnl so it's easy to change back to 'regular' autoconf vars if we needed to.  dnl so it's easy to change back to 'regular' autoconf vars if we needed to.
87    AC_CHECK_HEADERS(string, [pcre_has_cpp_headers="1"],
88                             [pcre_has_cpp_headers="0"])
89  AC_CHECK_HEADERS(bits/type_traits.h, [pcre_has_bits_type_traits="1"],  AC_CHECK_HEADERS(bits/type_traits.h, [pcre_has_bits_type_traits="1"],
90                                       [pcre_has_bits_type_traits="0"])                                       [pcre_has_bits_type_traits="0"])
91  AC_CHECK_HEADERS(type_traits.h, [pcre_has_type_traits="1"],  AC_CHECK_HEADERS(type_traits.h, [pcre_has_type_traits="1"],
# Line 99  AC_SUBST(pcre_has_bits_type_traits) Line 95  AC_SUBST(pcre_has_bits_type_traits)
95  AC_SUBST(pcre_has_type_traits)  AC_SUBST(pcre_has_type_traits)
96  AC_LANG_RESTORE  AC_LANG_RESTORE
97    
98    dnl From the above, we now have enough info to know if C++ is fully installed
99    if test -n "$ac_cv_prog_ac_ct_CXX" -a "$pcre_has_cpp_headers" = 1; then
100      MAYBE_CPP_TARGETS='$(CPP_TARGETS)'
101    fi
102    AC_SUBST(MAYBE_CPP_TARGETS)
103    
104    
105  dnl Checks for typedefs, structures, and compiler characteristics.  dnl Checks for typedefs, structures, and compiler characteristics.
106    
107  AC_C_CONST  AC_C_CONST

Legend:
Removed from v.77  
changed lines
  Added in v.79

  ViewVC Help
Powered by ViewVC 1.1.5