diff --git a/config_help.txt b/config_help.txt index c15083cc548943ebd9059856e7986389a504549d..ece83a2c9ad5a2bce83d3c5111a71bc111f76659 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. diff --git a/configure b/configure index a9f3e0ab6505c19b029222fd860ce755743c0799..a624b66225bdcd6ed90712aad0a5729048566d27 100755 --- a/configure +++ b/configure @@ -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 73eef1e4bdab5d1ff9f89204856b019e2a20c542..d82f641d66c87f845f22f2ce47c70ab10c15246e 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";