Commit 61c43427 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

7.2 cleanup commit

parent 216b1984

aclocal.m4

+76 −0
Original line number Diff line number Diff line
@@ -10,6 +10,82 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without 
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A

dnl PARTICULAR PURPOSE.



#serial 12



dnl By default, many hosts won't let programs access large files;

dnl one must use special compiler options to get large-file access to work.

dnl For more details about this brain damage please see:

dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html



dnl Written by Paul Eggert <eggert@twinsun.com>.



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_TEST_INCLUDES

AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,

  [[#include <sys/types.h>

    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];

  ]])



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)

AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,

  [AC_CACHE_CHECK([for $1 value needed for large files], $3,

     [$3=no

      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES

$5

        ,

	[$6], 

	,

	[AC_TRY_COMPILE([#define $1 $2]

AC_SYS_LARGEFILE_TEST_INCLUDES

$5

	   ,

	   [$6],

	   [$3=$2])])])

   if test "[$]$3" != no; then

     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])

   fi])



AC_DEFUN(AC_SYS_LARGEFILE,

  [AC_ARG_ENABLE(largefile,

     [  --disable-largefile     omit support for large files])

   if test "$enable_largefile" != no; then



     AC_CACHE_CHECK([for special C compiler options needed for large files],

       ac_cv_sys_largefile_CC,

       [ac_cv_sys_largefile_CC=no

        if test "$GCC" != yes; then

	  # IRIX 6.2 and later do not support large files by default,

	  # so use the C compiler's -n32 option if that helps.

	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,

	    [ac_save_CC="$CC"

	     CC="$CC -n32"

	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,

	       ac_cv_sys_largefile_CC=' -n32')

	     CC="$ac_save_CC"])

        fi])

     if test "$ac_cv_sys_largefile_CC" != no; then

       CC="$CC$ac_cv_sys_largefile_CC"

     fi



     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,

       ac_cv_sys_file_offset_bits,

       [Number of bits in a file offset, on hosts where this is settable.])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,

       ac_cv_sys_largefile_source,

       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],

       [#include <stdio.h>], [return !ftello;])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,

       ac_cv_sys_large_files,

       [Define for large files, on AIX-style hosts.])

dnl	lftp does not need ftello, and _XOPEN_SOURCE=500 makes resolv.h fail.

dnl     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,

dnl       ac_cv_sys_xopen_source,

dnl       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],

dnl       [#include <stdio.h>], [return !ftello;])

   fi

  ])



# Like AC_CONFIG_HEADER, but automatically create stamp file.



AC_DEFUN(AM_CONFIG_HEADER,

config.h.in

+18 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ 
/* Define if you have the gethostbyname_r() function with 6 arguments */

#undef HAVE_GETHOSTBYNAME_R_6



/* Define if you have the inet_ntoa_r function declared. */

#undef HAVE_INET_NTOA_R_DECL



/* Define if you need the _REENTRANT define for some functions */

#undef NEED_REENTRANT



/* The number of bytes in a long double.  */

#undef SIZEOF_LONG_DOUBLE
@@ -163,6 +169,9 @@ 
/* Define if you have the <netdb.h> header file.  */

#undef HAVE_NETDB_H



/* Define if you have the <netinet/if_ether.h> header file.  */

#undef HAVE_NETINET_IF_ETHER_H



/* Define if you have the <netinet/in.h> header file.  */

#undef HAVE_NETINET_IN_H
@@ -265,6 +274,15 @@ 
/* Version number of package */

#undef VERSION



/* Number of bits in a file offset, on hosts where this is settable. */

#undef _FILE_OFFSET_BITS



/* Define to make ftello visible on some hosts (e.g. HP-UX 10.20). */

#undef _LARGEFILE_SOURCE



/* Define for large files, on AIX-style hosts. */

#undef _LARGE_FILES



/* Set to explicitly specify we don't want to use thread-safe functions */

#undef DISABLED_THREADSAFE

docs/RESOURCES

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ Standards 


Compilers

---------

  MingW32 - http://www.xraylith.wisc.edu/~khan/software/gnu-win32/index.html

  MingW32 - http://www.mingw.org



  gcc     - http://www.gnu.org/software/gcc/gcc.html

include/curl/curl.h

+2 −2
Original line number Diff line number Diff line
@@ -422,8 +422,8 @@ char *curl_getenv(char *variable); 
char *curl_version(void);



/* This is the version number */

#define LIBCURL_VERSION "7.1.1"

#define LIBCURL_VERSION_NUM 0x070101

#define LIBCURL_VERSION "7.2"

#define LIBCURL_VERSION_NUM 0x070200



/* linked-list structure for the CURLOPT_QUOTE option */

struct curl_slist {

reconf

+4 −5
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ die(){ 
	echo "$@" ; exit

}



aclocal    || die "ahhhhh"

aclocal -I .	|| die "ahhhhh"

autoheader	|| die "ahhhhh"

automake	|| die "ahhhhh"

autoconf	|| die "ahhhhh"