Commit 73a2fcea authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

includes: remove curl/curlbuild.h and curl/curlrules.h 

Rely entirely on curl/system.h now.

Introduced in Aug 2008 with commit 14240e9e. Now gone.

Fixes #1456
parent 54b636f1

CMakeLists.txt

+4 −10
Original line number Diff line number Diff line
@@ -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
@@ -1111,7 +1111,7 @@ else() 
  set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT})

endif()



# TODO test which of these headers are required for the typedefs used in curlbuild.h

# TODO test which of these headers are required

if(WIN32)

  set(CURL_PULL_WS2TCPIP_H ${HAVE_WS2TCPIP_H})

else()
@@ -1297,16 +1297,10 @@ if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE) 
  set(CURL_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")

endif()



# Installation.

# First, install generated curlbuild.h

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/curl/curlbuild.h"

    DESTINATION include/curl )

# Next, install other headers excluding curlbuild.h

# install headers

install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"

    DESTINATION include

    FILES_MATCHING PATTERN "*.h"

    PATTERN "curlbuild.h" EXCLUDE)



    FILES_MATCHING PATTERN "*.h")



# Workaround for MSVS10 to avoid the Dialog Hell

# FIXME: This could be removed with future version of CMake.

MacOSX-Framework

+0 −9
Original line number Diff line number Diff line
@@ -126,15 +126,6 @@ if test ! -z $SDK32; then 
    pwd

    lipo libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64 -create -output libcurl.framework/${FRAMEWORK_VERSION}/libcurl

    rm libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64

    cp libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild32.h

    cp include/curl/curlbuild.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild64.h

    cat >libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild.h <<EOF

#ifdef __LP64__

#include "curl/curlbuild64.h"

#else

#include "curl/curlbuild32.h"

#endif

EOF

  fi



  pwd

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ ACLOCAL_AMFLAGS = -I m4 
CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in      \

 CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake   \

 CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake       \

 include/curl/curlbuild.h.cmake CMake/Macros.cmake              \

 CMake/Macros.cmake              \

 CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake             \

 CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake                \

 CMake/FindMbedTLS.cmake

acinclude.m4

+3 −15
Original line number Diff line number Diff line
@@ -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
@@ -2079,10 +2079,7 @@ _EOF 
dnl CURL_CONFIGURE_LONG

dnl -------------------------------------------------

dnl Find out the size of long as reported by sizeof() and define

dnl CURL_SIZEOF_LONG as appropriate to be used in template file

dnl include/curl/curlbuild.h.in to properly configure the library.

dnl The size of long is a build time characteristic and as such

dnl must be recorded in curlbuild.h

dnl CURL_SIZEOF_LONG.



AC_DEFUN([CURL_CONFIGURE_LONG], [

  if test -z "$ac_cv_sizeof_long" ||
@@ -2095,10 +2092,6 @@ AC_DEFUN([CURL_CONFIGURE_LONG], [ 


dnl CURL_CONFIGURE_CURL_SOCKLEN_T

dnl -------------------------------------------------

dnl Find out suitable curl_socklen_t data type definition and size, making

dnl appropriate definitions for template file include/curl/curlbuild.h.in

dnl to properly configure and use the library.

dnl

dnl The need for the curl_socklen_t definition arises mainly to properly

dnl interface HP-UX systems which on one hand have a typedef'ed socklen_t

dnl data type which is 32 or 64-Bit wide depending on the data model being
@@ -2222,10 +2215,6 @@ AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [ 


dnl CURL_CONFIGURE_PULL_SYS_POLL

dnl -------------------------------------------------

dnl Find out if system header file sys/poll.h must be included by the

dnl external interface, making appropriate definitions for template file

dnl include/curl/curlbuild.h.in to properly configure and use the library.

dnl

dnl The need for the sys/poll.h inclusion arises mainly to properly

dnl interface AIX systems which define macros 'events' and 'revents'.
@@ -2859,8 +2848,7 @@ AC_DEFUN([DO_CURL_OFF_T_SUFFIX_CHECK], [ 
dnl CURL_CONFIGURE_CURL_OFF_T

dnl -------------------------------------------------

dnl Find out suitable curl_off_t data type definition and associated

dnl items, and make the appropriate definitions used in template file

dnl include/curl/curlbuild.h.in to properly configure the library.

dnl items



AC_DEFUN([CURL_CONFIGURE_CURL_OFF_T], [

  AC_REQUIRE([CURL_INCLUDES_INTTYPES])dnl

buildconf

+0 −1
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ for fname in .deps \ 
    configure \

    configurehelp.pm \

    curl-config \

    curlbuild.h \

    depcomp \

    libcares.pc \

    libcurl.pc \