diff options
| -rw-r--r-- | config_help.txt | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config_help.txt b/config_help.txt index c15083cc54..ece83a2c9a 100644 --- a/config_help.txt +++ b/config_help.txt @@ -187,8 +187,8 @@ Third Party Libraries: + -openssl ............. Enable run-time OpenSSL support. -openssl-linked ...... Enabled linked OpenSSL support. - -no-libproxy ......... Do not compile support for libproxy - + -libproxy ............ Use libproxy from the operating system. + * -no-libproxy ......... Do not compile support for libproxy + -libproxy ............ Use libproxy from the operating system. -qt-pcre ............. Use the PCRE library bundled with Qt. + -system-pcre ......... Use the PCRE library from the operating system. @@ -719,7 +719,7 @@ CFG_GLIB=auto CFG_GTK=auto CFG_LARGEFILE=yes CFG_OPENSSL=auto -CFG_LIBPROXY=auto +CFG_LIBPROXY=no CFG_SECURETRANSPORT=auto CFG_PRECOMPILE=auto CFG_LTCG=no diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 73eef1e4bd..d82f641d66 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -264,7 +264,7 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "OPENGL_ES_2" ] = "yes"; dictionary[ "SSL" ] = "auto"; dictionary[ "OPENSSL" ] = "auto"; - dictionary[ "LIBPROXY" ] = "auto"; + dictionary[ "LIBPROXY" ] = "no"; dictionary[ "DBUS" ] = "auto"; dictionary[ "STYLE_WINDOWS" ] = "yes"; |