diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/FAQ | 27 | ||||
| -rw-r--r-- | docs/INSTALL.cmake | 11 | ||||
| -rw-r--r-- | docs/examples/Makefile.am | 8 |
3 files changed, 2 insertions, 44 deletions
@@ -30,7 +30,6 @@ FAQ 2.2 Does curl work/build with other SSL libraries? 2.3 Where can I find a copy of LIBEAY32.DLL? 2.4 Does curl support SOCKS (RFC 1928) ? - 2.5 Install libcurl for both 32bit and 64bit? 3. Usage Problems 3.1 curl: (1) SSL is disabled, https: not supported @@ -466,32 +465,6 @@ FAQ Yes, SOCKS 4 and 5 are supported. - 2.5 Install libcurl for both 32bit and 64bit? - - In curl's configure procedure one of the regular include files gets created - with platform specific information. The file 'curl/curlbuild.h' in the - installed libcurl file tree is therefore somewhat tied to that particular - platform. - - To allow applications to get built for either 32bit or 64bit you need to - install libcurl headers for both setups and unfortunately curl doesn't do - this automatically. - - A commonly used procedure is this: - - $ ./configure [32bit platform] - $ mv curl/curlbuild.h curl/curlbuild-32bit.h - $ ./configure [64bit platform] - $ mv curl/curlbuild.h curl/curlbuild-64bit.h - - Then you make a toplevel curl/curlbuild.h replacement that only does this: - - #ifdef IS_32BIT - #include "curlbuild-32bit.h" - else - #include "curlbuild-64bit.h" - #endif - 3. Usage problems diff --git a/docs/INSTALL.cmake b/docs/INSTALL.cmake index 61492dbd6..abdfb46b2 100644 --- a/docs/INSTALL.cmake +++ b/docs/INSTALL.cmake @@ -37,17 +37,6 @@ Current flaws in the curl CMake build - Does't detect the correct strerror_r flavor when cross-compiling (issue #1123) -Important notice -================== - If you got your curl sources from a distribution tarball, make sure to - delete the generic 'include/curl/curlbuild.h' file that comes with it: - rm -f curl/include/curl/curlbuild.h - - The purpose of this file is to provide reasonable definitions for systems - where autoconfiguration is not available. CMake will create its own - version of this file in its build directory. If the "generic" version - is not deleted, weird build errors may occur on some systems. - Command Line CMake ================== A CMake build of curl is similar to the autotools build of curl. It diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 7a56f345c..afd35c20b 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -30,13 +30,9 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \ # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h -# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h # $(top_srcdir)/include is for libcurl's external include files -AM_CPPFLAGS = -I$(top_builddir)/include/curl \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include LIBDIR = $(top_builddir)/lib |