diff options
author | Giuseppe D'Angelo <dangelog@gmail.com> | 2012-01-23 22:31:13 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-26 23:10:52 +0100 |
commit | d6fccc69f39def255ec5d1ea36c37c49273c23b1 (patch) | |
tree | 3f17ce54a4177f3e33a081ce3092c5c271b90dcd /configure | |
parent | 3f91558d400be62be96fc3c6da36ad846ccddc9c (diff) |
QRegularExpression: configure support for PCRE
Added PCRE config.tests, and logic and command line options
(-qt-pcre and -system-pcre) for configure and configure.exe.
Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 34 |
1 files changed, 34 insertions, 0 deletions
@@ -814,6 +814,7 @@ CFG_COREWLAN=auto CFG_NOPROCESS=no CFG_ICU=auto CFG_FORCE_ASSERTS=no +CFG_PCRE=auto # initalize variables used for installation QT_INSTALL_PREFIX= @@ -2317,6 +2318,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + pcre) + if [ "$VAL" = "qt" ] || [ "$VAL" = "system" ]; then + CFG_PCRE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; *) UNKNOWN_OPT=yes ;; @@ -3559,6 +3567,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative] [-no-declarative-debug] [-declarative-debug] [-no-location] [-location] + [-qt-pcre] [-system-pcre] [additional platform specific options (see below)] @@ -3795,6 +3804,9 @@ Third Party Libraries: + -openssl ........... Enable run-time OpenSSL support. -openssl-linked .... Enabled linked OpenSSL support. + -qt-pcre ........... Use the PCRE library bundled with Qt. + + -system-pcre ....... Use the PCRE library from the operating system. + Additional options: -make <part> ....... Add part to the list of parts to be built at make time. @@ -6410,6 +6422,23 @@ if [ "$CFG_OPENSSL" != "no" ]; then fi fi +# detect PCRE +if [ "$CFG_PCRE" != "qt" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/pcre "PCRE" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_PCRE=system + else + if [ "$CFG_PCRE" = "system" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "PCRE support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_PCRE=qt + fi + fi +fi + # detect OpenVG support if [ "$CFG_OPENVG" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then @@ -6931,6 +6960,10 @@ if [ "$CFG_FORCE_ASSERTS" = "yes" ]; then QT_CONFIG="$QT_CONFIG force_asserts" fi +if [ "$CFG_PCRE" = "qt" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG pcre" +fi + # # Some Qt modules are too advanced in C++ for some old compilers # Detect here the platforms where they are known to work. @@ -8078,6 +8111,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then echo "CoreWlan support ....... $CFG_COREWLAN" fi echo "libICU support ......... $CFG_ICU" +echo "PCRE support ........... $CFG_PCRE" if [ "$CFG_XCB_LIMITED" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then echo "Xcb support ............ limited (old version)" else |