From owner-svn-src-user@FreeBSD.ORG Sat May 7 21:54:49 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8CAE1065675; Sat, 7 May 2011 21:54:49 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A8A148FC0A; Sat, 7 May 2011 21:54:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p47LsnRl016344; Sat, 7 May 2011 21:54:49 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p47LsnIx016341; Sat, 7 May 2011 21:54:49 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105072154.p47LsnIx016341@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 7 May 2011 21:54:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221609 - in user/gabor/tre-integration/contrib/tre: . lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2011 21:54:49 -0000 Author: gabor Date: Sat May 7 21:54:49 2011 New Revision: 221609 URL: http://svn.freebsd.org/changeset/base/221609 Log: - Tweak config.h to suit our building needs Added: user/gabor/tre-integration/contrib/tre/lib/config.h - copied, changed from r221409, user/gabor/tre-integration/contrib/tre/config.h Modified: user/gabor/tre-integration/contrib/tre/config.h Modified: user/gabor/tre-integration/contrib/tre/config.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/config.h Sat May 7 18:42:41 2011 (r221608) +++ user/gabor/tre-integration/contrib/tre/config.h Sat May 7 21:54:49 2011 (r221609) @@ -1,37 +1,9 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -/* #undef ENABLE_NLS */ - /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -/* #undef HAVE_DCGETTEXT */ - /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -41,12 +13,6 @@ /* Define to 1 if you have the `getopt_long' function. */ #define HAVE_GETOPT_LONG 1 -/* Define if the GNU gettext() function is already present or preinstalled. */ -/* #undef HAVE_GETTEXT */ - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -71,9 +37,6 @@ /* Define to 1 if you have the `iswupper' function or macro. */ #define HAVE_ISWUPPER 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBUTF8_H */ - /* Define to 1 if you have the `mbrtowc' function or macro. */ #define HAVE_MBRTOWC 1 @@ -81,17 +44,11 @@ #define HAVE_MBSTATE_T 1 /* Define to 1 if you have the `mbtowc' function or macro. */ -/* #undef HAVE_MBTOWC */ +#define HAVE_MBTOWC 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_REGEX_H */ - -/* Define to 1 if the system has the type `reg_errcode_t'. */ -/* #undef HAVE_REG_ERRCODE_T */ - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -141,7 +98,7 @@ #define HAVE_WCSRTOMBS 1 /* Define to 1 if you have the `wcstombs' function or macro. */ -/* #undef HAVE_WCSTOMBS */ +#define HAVE_WCSTOMBS 1 /* Define to 1 if you have the `wctype' function or macro. */ #define HAVE_WCTYPE 1 @@ -155,27 +112,6 @@ /* Define if you want to disable debug assertions. */ #define NDEBUG 1 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -#define PACKAGE "tre" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "tre-general@lists.laurikari.net" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "TRE" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TRE 0.8.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "tre" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.0" - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -190,9 +126,6 @@ /* Define if you want to enable approximate matching functionality. */ #define TRE_APPROX 1 -/* Define if you want TRE to print debug messages to stdout. */ -/* #undef TRE_DEBUG */ - /* Define to enable multibyte character set support. */ #define TRE_MULTIBYTE 1 @@ -200,16 +133,10 @@ the internal tre_tnfa_t structure */ #define TRE_REGEX_T_FIELD value -/* Define to the absolute path to the system regex.h */ -/* #undef TRE_SYSTEM_REGEX_H_PATH */ - /* Define if you want TRE to use alloca() instead of malloc() when allocating memory needed for regexec operations. */ #define TRE_USE_ALLOCA 1 -/* Define to include the system regex.h from TRE regex.h */ -/* #undef TRE_USE_SYSTEM_REGEX_H */ - /* TRE version string. */ #define TRE_VERSION "0.8.0" @@ -227,33 +154,3 @@ /* Version number of package */ #define VERSION "0.8.0" - -/* Define to the maximum value of wchar_t if not already defined elsewhere */ -/* #undef WCHAR_MAX */ - -/* Define if wchar_t is signed */ -/* #undef WCHAR_T_SIGNED */ - -/* Define if wchar_t is unsigned */ -/* #undef WCHAR_T_UNSIGNED */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to enable GNU extensions in glibc */ -#define _GNU_SOURCE 1 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define on IRIX */ -/* #undef _REGCOMP_INTERNAL */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif Copied and modified: user/gabor/tre-integration/contrib/tre/lib/config.h (from r221409, user/gabor/tre-integration/contrib/tre/config.h) ============================================================================== --- user/gabor/tre-integration/contrib/tre/config.h Tue May 3 20:13:27 2011 (r221409, copy source) +++ user/gabor/tre-integration/contrib/tre/lib/config.h Sat May 7 21:54:49 2011 (r221609) @@ -1,37 +1,9 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -/* #undef ENABLE_NLS */ - /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -/* #undef HAVE_DCGETTEXT */ - /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -41,12 +13,6 @@ /* Define to 1 if you have the `getopt_long' function. */ #define HAVE_GETOPT_LONG 1 -/* Define if the GNU gettext() function is already present or preinstalled. */ -/* #undef HAVE_GETTEXT */ - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -71,9 +37,6 @@ /* Define to 1 if you have the `iswupper' function or macro. */ #define HAVE_ISWUPPER 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBUTF8_H */ - /* Define to 1 if you have the `mbrtowc' function or macro. */ #define HAVE_MBRTOWC 1 @@ -81,17 +44,11 @@ #define HAVE_MBSTATE_T 1 /* Define to 1 if you have the `mbtowc' function or macro. */ -/* #undef HAVE_MBTOWC */ +#define HAVE_MBTOWC 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_REGEX_H */ - -/* Define to 1 if the system has the type `reg_errcode_t'. */ -/* #undef HAVE_REG_ERRCODE_T */ - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -141,7 +98,7 @@ #define HAVE_WCSRTOMBS 1 /* Define to 1 if you have the `wcstombs' function or macro. */ -/* #undef HAVE_WCSTOMBS */ +#define HAVE_WCSTOMBS 1 /* Define to 1 if you have the `wctype' function or macro. */ #define HAVE_WCTYPE 1 @@ -155,27 +112,6 @@ /* Define if you want to disable debug assertions. */ #define NDEBUG 1 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -#define PACKAGE "tre" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "tre-general@lists.laurikari.net" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "TRE" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TRE 0.8.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "tre" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.0" - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -190,9 +126,6 @@ /* Define if you want to enable approximate matching functionality. */ #define TRE_APPROX 1 -/* Define if you want TRE to print debug messages to stdout. */ -/* #undef TRE_DEBUG */ - /* Define to enable multibyte character set support. */ #define TRE_MULTIBYTE 1 @@ -200,16 +133,10 @@ the internal tre_tnfa_t structure */ #define TRE_REGEX_T_FIELD value -/* Define to the absolute path to the system regex.h */ -/* #undef TRE_SYSTEM_REGEX_H_PATH */ - /* Define if you want TRE to use alloca() instead of malloc() when allocating memory needed for regexec operations. */ #define TRE_USE_ALLOCA 1 -/* Define to include the system regex.h from TRE regex.h */ -/* #undef TRE_USE_SYSTEM_REGEX_H */ - /* TRE version string. */ #define TRE_VERSION "0.8.0" @@ -227,33 +154,3 @@ /* Version number of package */ #define VERSION "0.8.0" - -/* Define to the maximum value of wchar_t if not already defined elsewhere */ -/* #undef WCHAR_MAX */ - -/* Define if wchar_t is signed */ -/* #undef WCHAR_T_SIGNED */ - -/* Define if wchar_t is unsigned */ -/* #undef WCHAR_T_UNSIGNED */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to enable GNU extensions in glibc */ -#define _GNU_SOURCE 1 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define on IRIX */ -/* #undef _REGCOMP_INTERNAL */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif