This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocurl.
commit f2752b8c94b338cdf9982236702640f162648de1 Author: Stephane Glondu <st...@glondu.net> Date: Tue Feb 23 10:33:43 2016 +0100 Imported Upstream version 0.5.6 --- CHANGES.txt | 3 + OMakefile | 157 ----------------------------------------------------- OMakeroot | 45 --------------- configure | 51 ++++++++++------- configure.in | 19 ++++--- examples/OMakefile | 16 ------ 6 files changed, 46 insertions(+), 245 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4e9aa5c..5b51fbd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +0.5.6 - 21 Mar 2013 + * configure: more robust test for libcurl + 0.5.5 - 23 Feb 2013 + CURLINFO_LOCAL_IP CURLINFO_LOCAL_PORT diff --git a/OMakefile b/OMakefile deleted file mode 100644 index 27c6b18..0000000 --- a/OMakefile +++ /dev/null @@ -1,157 +0,0 @@ -.PHONY: all install clean - -static. = - if $(CheckProg ocamlc) - BYTE_ENABLED = true - export - if $(CheckProg ocamlc.opt) - BYTE_ENABLED = true - export - if $(CheckProg ocamlopt) - NATIVE_ENABLED = true - export - if $(CheckProg ocamlopt.opt) - NATIVE_ENABLED = true - export - -CFLAGS += -DHAVE_CONFIG_H $(shell curl-config --cflags) - -OCamlLibrary(curl, curl) -StaticCLibrary(libcurl-helper, curl-helper) - -.DEFAULT: curl.cma curl.cmxa libcurl-helper.a examples - -.SUBDIRS: examples - -public.CheckCHeaderDeclSrc(decl, headers) = - return $""" -#pragma warning( disable : 4100 ) -$(add-wrapper $'#include <', >$(nl),$(headers)) -int main(int argc, char **argv) { -#ifndef $(decl) - (void) $(decl); -#endif -return 0; -} -""" - -public.CheckCHeaderDecl(decl, headers) = - return $(TryLinkC $(CheckCHeaderDeclSrc $(decl), $(headers))) - -## -## Simplistic function that works for the current names tested -## - -public.HaveDeclName(decl) = - return $"""HAVE_DECL_$(uppercase $(decl))""" - -public.HaveDecls(decls, headers) = - f = $(fopen config.h, w) - fprintln($(f), $"#ifndef OCURL_CONFIG_H") - fprintln($(f), $"#define OCURL_CONFIG_H") - foreach(decl, $(decls)) - ConfMsgChecking($(decl)) - if $(CheckCHeaderDecl $(decl), $(headers)) - fprintln($(f), "#define $(HaveDeclName $(decl)) 1") - ConfMsgFound(true) - else - fprintln($(f), "#undef $(HaveDeclName $(decl))") - ConfMsgFound(false) - fprintln($(f), $"#endif /* OCURL_CONFIG_H */") - close($(f)) - -static. = - HaveDecls(\ -CURLOPT_FILE CURLOPT_URL CURLOPT_PORT CURLOPT_PROXY CURLOPT_USERPWD \ -CURLOPT_PROXYUSERPWD CURLOPT_RANGE CURLOPT_INFILE CURLOPT_ERRORBUFFER \ -CURLOPT_WRITEFUNCTION CURLOPT_READFUNCTION CURLOPT_TIMEOUT \ -CURLOPT_INFILESIZE CURLOPT_POSTFIELDS CURLOPT_REFERER CURLOPT_FTPPORT \ -CURLOPT_USERAGENT CURLOPT_LOW_SPEED_LIMIT CURLOPT_LOW_SPEED_TIME \ -CURLOPT_RESUME_FROM CURLOPT_COOKIE CURLOPT_HTTPHEADER \ -CURLOPT_HTTPPOST CURLOPT_SSLCERT CURLOPT_SSLCERTPASSWD CURLOPT_SSLKEYPASSWD \ -CURLOPT_CRLF CURLOPT_QUOTE CURLOPT_WRITEHEADER CURLOPT_COOKIEFILE \ -CURLOPT_SSLVERSION CURLOPT_TIMECONDITION CURLOPT_TIMEVALUE \ -CURLOPT_CUSTOMREQUEST CURLOPT_STDERR CURLOPT_POSTQUOTE CURLOPT_WRITEINFO \ -CURLOPT_VERBOSE CURLOPT_HEADER CURLOPT_NOPROGRESS CURLOPT_NOBODY \ -CURLOPT_FAILONERROR CURLOPT_UPLOAD CURLOPT_POST CURLOPT_FTPLISTONLY \ -CURLOPT_FTPAPPEND CURLOPT_NETRC CURLOPT_FOLLOWLOCATION \ -CURLOPT_TRANSFERTEXT CURLOPT_PUT CURLOPT_PROGRESSFUNCTION \ -CURLOPT_PROGRESSDATA CURLOPT_AUTOREFERER CURLOPT_PROXYPORT \ -CURLOPT_POSTFIELDSIZE CURLOPT_HTTPPROXYTUNNEL CURLOPT_INTERFACE \ -CURLOPT_KRB4LEVEL CURLOPT_SSL_VERIFYPEER CURLOPT_CAINFO \ -CURLOPT_MAXREDIRS CURLOPT_FILETIME CURLOPT_TELNETOPTIONS \ -CURLOPT_MAXCONNECTS CURLOPT_CLOSEPOLICY CURLOPT_FRESH_CONNECT \ -CURLOPT_FORBID_REUSE CURLOPT_RANDOM_FILE CURLOPT_EGDSOCKET \ -CURLOPT_CONNECTTIMEOUT CURLOPT_HEADERFUNCTION CURLOPT_HTTPGET \ -CURLOPT_SSL_VERIFYHOST CURLOPT_COOKIEJAR CURLOPT_SSL_CIPHER_LIST \ -CURLOPT_HTTP_VERSION CURLOPT_FTP_USE_EPSV CURLOPT_SSLCERTTYPE \ -CURLOPT_SSLKEY CURLOPT_SSLKEYTYPE CURLOPT_SSLENGINE \ -CURLOPT_SSLENGINE_DEFAULT CURLOPT_DNS_USE_GLOBAL_CACHE \ -CURLOPT_DNS_CACHE_TIMEOUT CURLOPT_PREQUOTE CURLOPT_DEBUGFUNCTION \ -CURLOPT_DEBUGDATA CURLOPT_COOKIESESSION CURLOPT_CAPATH \ -CURLOPT_BUFFERSIZE CURLOPT_NOSIGNAL CURLOPT_SHARE \ -CURLOPT_PROXYTYPE CURLOPT_ENCODING CURLOPT_PRIVATE CURLOPT_HTTP200ALIASES \ -CURLOPT_UNRESTRICTED_AUTH CURLOPT_FTP_USE_EPRT CURLOPT_HTTPAUTH \ -CURLOPT_FTP_CREATE_MISSING_DIRS CURLOPT_PROXYAUTH \ -CURLOPT_FTP_RESPONSE_TIMEOUT CURLOPT_IPRESOLVE CURLOPT_MAXFILESIZE \ -CURLOPT_INFILESIZE_LARGE CURLOPT_RESUME_FROM_LARGE \ -CURLOPT_MAXFILESIZE_LARGE CURLOPT_NETRC_FILE CURLOPT_FTP_SSL \ -CURLOPT_POSTFIELDSIZE_LARGE CURLOPT_TCP_NODELAY CURLOPT_FTPSSLAUTH \ -CURLOPT_IOCTLFUNCTION CURLOPT_FTP_ACCOUNT CURLOPT_COOKIELIST \ -CURLOPT_IGNORE_CONTENT_LENGTH CURLOPT_FTP_SKIP_PASV_IP \ -CURLOPT_FTP_FILEMETHOD CURLOPT_LOCALPORT CURLOPT_LOCALPORTRANGE \ -CURLOPT_CONNECT_ONLY CURLOPT_MAX_SEND_SPEED_LARGE \ -CURLOPT_MAX_RECV_SPEED_LARGE CURLOPT_FTP_ALTERNATIVE_TO_USER \ -CURLOPT_SSL_SESSIONID_CACHE CURLOPT_SSH_AUTH_TYPES \ -CURLOPT_SSH_PUBLIC_KEYFILE CURLOPT_SSH_PRIVATE_KEYFILE \ -CURLOPT_FTP_SSL_CCC CURLOPT_TIMEOUT_MS CURLOPT_CONNECTTIMEOUT_MS \ -CURLOPT_HTTP_TRANSFER_DECODING CURLOPT_HTTP_CONTENT_DECODING \ -CURLOPT_NEW_FILE_PERMS CURLOPT_NEW_DIRECTORY_PERMS CURLOPT_POST301 \ -CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 CURLOPT_COPYPOSTFIELDS \ -CURLOPT_PROXY_TRANSFER_MODE CURLOPT_SEEKFUNCTION \ - \ -CURLINFO_EFFECTIVE_URL CURLINFO_RESPONSE_CODE CURLINFO_TOTAL_TIME \ -CURLINFO_NAMELOOKUP_TIME CURLINFO_CONNECT_TIME CURLINFO_PRETRANSFER_TIME \ -CURLINFO_SIZE_UPLOAD CURLINFO_SIZE_DOWNLOAD CURLINFO_SPEED_DOWNLOAD \ -CURLINFO_SPEED_UPLOAD CURLINFO_HEADER_SIZE CURLINFO_REQUEST_SIZE \ -CURLINFO_SSL_VERIFYRESULT CURLINFO_FILETIME CURLINFO_CONTENT_LENGTH_DOWNLOAD \ -CURLINFO_CONTENT_LENGTH_UPLOAD CURLINFO_STARTTRANSFER_TIME \ -CURLINFO_CONTENT_TYPE CURLINFO_REDIRECT_TIME CURLINFO_REDIRECT_COUNT \ -CURLINFO_PRIVATE CURLINFO_HTTP_CONNECTCODE CURLINFO_HTTPAUTH_AVAIL \ -CURLINFO_PROXYAUTH_AVAIL CURLINFO_OS_ERRNO CURLINFO_NUM_CONNECTS \ -CURLINFO_SSL_ENGINES CURLINFO_COOKIELIST CURLINFO_LASTSOCKET \ -CURLINFO_FTP_ENTRY_PATH \ - \ -CURLE_UNSUPPORTED_PROTOCOL CURLE_FAILED_INIT CURLE_URL_MALFORMAT \ -CURLE_URL_MALFORMAT_USER CURLE_COULDNT_RESOLVE_PROXY \ -CURLE_COULDNT_RESOLVE_HOST CURLE_COULDNT_CONNECT \ -CURLE_FTP_WEIRD_SERVER_REPLY CURLE_FTP_ACCESS_DENIED \ -CURLE_FTP_USER_PASSWORD_INCORRECT CURLE_FTP_WEIRD_PASS_REPLY \ -CURLE_FTP_WEIRD_USER_REPLY CURLE_FTP_WEIRD_PASV_REPLY \ -CURLE_FTP_WEIRD_227_FORMAT CURLE_FTP_CANT_GET_HOST CURLE_FTP_CANT_RECONNECT \ -CURLE_FTP_COULDNT_SET_BINARY CURLE_PARTIAL_FILE CURLE_FTP_COULDNT_RETR_FILE \ -CURLE_FTP_WRITE_ERROR CURLE_FTP_QUOTE_ERROR CURLE_HTTP_RETURNED_ERROR \ -CURLE_WRITE_ERROR CURLE_MALFORMAT_USER CURLE_FTP_COULDNT_STOR_FILE \ -CURLE_READ_ERROR CURLE_OUT_OF_MEMORY CURLE_OPERATION_TIMEOUTED \ -CURLE_FTP_COULDNT_SET_ASCII CURLE_FTP_PORT_FAILED CURLE_FTP_COULDNT_USE_REST \ -CURLE_FTP_COULDNT_GET_SIZE CURLE_HTTP_RANGE_ERROR CURLE_HTTP_POST_ERROR \ -CURLE_SSL_CONNECT_ERROR CURLE_BAD_DOWNLOAD_RESUME \ -CURLE_FILE_COULDNT_READ_FILE CURLE_LDAP_CANNOT_BIND CURLE_LDAP_SEARCH_FAILED \ -CURLE_LIBRARY_NOT_FOUND CURLE_FUNCTION_NOT_FOUND CURLE_ABORTED_BY_CALLBACK \ -CURLE_BAD_FUNCTION_ARGUMENT CURLE_BAD_CALLING_ORDER CURLE_INTERFACE_FAILED \ -CURLE_BAD_PASSWORD_ENTERED CURLE_TOO_MANY_REDIRECTS \ -CURLE_UNKNOWN_TELNET_OPTION CURLE_TELNET_OPTION_SYNTAX \ -CURLE_SSL_PEER_CERTIFICATE CURLE_GOT_NOTHING CURLE_SSL_ENGINE_NOTFOUND \ -CURLE_SSL_ENGINE_SETFAILED CURLE_SEND_ERROR CURLE_RECV_ERROR \ -CURLE_SHARE_IN_USE CURLE_SSL_CERTPROBLEM CURLE_SSL_CIPHER CURLE_SSL_CACERT \ -CURLE_BAD_CONTENT_ENCODING CURLE_LDAP_INVALID_URL CURLE_FILESIZE_EXCEEDED \ -CURLE_FTP_SSL_FAILED CURLE_SEND_FAIL_REWIND CURLE_SSL_ENGINE_INITFAILED \ -CURLE_LOGIN_DENIED CURLE_TFTP_NOTFOUND CURLE_TFTP_PERM \ -CURLE_REMOTE_DISK_FULL CURLE_TFTP_ILLEGAL CURLE_TFTP_UNKNOWNID \ -CURLE_REMOTE_FILE_EXISTS CURLE_TFTP_NOSUCHUSER CURLE_CONV_FAILED \ -CURLE_CONV_REQD CURLE_SSL_CACERT_BADFILE CURLE_REMOTE_FILE_NOT_FOUND \ -CURLE_SSH CURLE_SSL_SHUTDOWN_FAILED CURLE_AGAIN, \ -curl/curl.h) - -clean: - rm -f *~ *.cm* *.o *.a core diff --git a/OMakeroot b/OMakeroot deleted file mode 100644 index 35c219d..0000000 --- a/OMakeroot +++ /dev/null @@ -1,45 +0,0 @@ -######################################################################## -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this file, to deal in the File without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the File, and to permit persons to whom the -# File is furnished to do so, subject to the following condition: -# -# THE FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE FILE OR -# THE USE OR OTHER DEALINGS IN THE FILE. - -######################################################################## -# The standard OMakeroot file. -# You will not normally need to modify this file. -# By default, your changes should be placed in the -# OMakefile in this directory. -# -# If you decide to modify this file, note that it uses exactly -# the same syntax as the OMakefile. -# - -# -# Include the standard installed configuration files. -# Any of these can be deleted if you are not using them, -# but you probably want to keep the Common file. -# -open build/C -open build/OCaml -open build/LaTeX - -# -# The command-line variables are defined *after* the -# standard configuration has been loaded. -# -DefineCommandVars() - -# -# Include the OMakefile in this directory. -# -.SUBDIRS: . diff --git a/configure b/configure index 277d500..9da61ba 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ocurl 0.5.5. +# Generated by GNU Autoconf 2.69 for ocurl 0.5.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ocurl' PACKAGE_TARNAME='ocurl' -PACKAGE_VERSION='0.5.5' -PACKAGE_STRING='ocurl 0.5.5' +PACKAGE_VERSION='0.5.6' +PACKAGE_STRING='ocurl 0.5.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -585,8 +585,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS INSTALLDIR CURLLIBS -CURLFLAGS -CURLDIR ac_prefix_program OCAMLFIND OCAMLBUILD @@ -1202,7 +1200,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ocurl 0.5.5 to adapt to many kinds of systems. +\`configure' configures ocurl 0.5.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1263,7 +1261,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ocurl 0.5.5:";; + short | recursive ) echo "Configuration of ocurl 0.5.6:";; esac cat <<\_ACEOF @@ -1342,7 +1340,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ocurl configure 0.5.5 +ocurl configure 0.5.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1443,7 +1441,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ocurl $as_me 0.5.5, which was +It was created by ocurl $as_me 0.5.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1792,12 +1790,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -CURLDIR=`curl-config --cflags` -CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1` -CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-` - -CFLAGS=$CURLDIR - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2587,6 +2579,29 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl cflags" >&5 +$as_echo_n "checking for libcurl cflags... " >&6; } +CFLAGS=`pkg-config libcurl --cflags || curl-config --cflags` +if test "$?" -eq 0 ; then : + +else + as_fn_error $? "libcurl was not found" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5 +$as_echo "$CFLAGS" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl libs" >&5 +$as_echo_n "checking for libcurl libs... " >&6; } +CURLLIBS=`pkg-config libcurl --libs || curl-config --libs` +if test "$?" -eq 0 ; then : + +else + as_fn_error $? "libcurl was not found" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLLIBS" >&5 +$as_echo "$CURLLIBS" >&6; } + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -3905,8 +3920,6 @@ fi - - ac_fn_c_check_decl "$LINENO" "CURLOPT_FILE" "ac_cv_have_decl_CURLOPT_FILE" " #include \"curl/curl.h\" @@ -7813,7 +7826,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ocurl $as_me 0.5.5, which was +This file was extended by ocurl $as_me 0.5.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7875,7 +7888,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ocurl config.status 0.5.5 +ocurl config.status 0.5.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index a8ddb62..cc11775 100644 --- a/configure.in +++ b/configure.in @@ -2,15 +2,20 @@ dnl dnl ocurl autoconf input dnl -AC_INIT(ocurl,0.5.5) +AC_INIT(ocurl,0.5.6) -CURLDIR=`curl-config --cflags` -CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1` -CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-` +AC_PROG_CC() -CFLAGS=$CURLDIR +AC_MSG_CHECKING([for libcurl cflags]) +CFLAGS=`pkg-config libcurl --cflags || curl-config --cflags` +AS_IF([ test "$?" -eq 0 ],,[AC_MSG_ERROR([libcurl was not found])] ) +AC_MSG_RESULT([$CFLAGS]) + +AC_MSG_CHECKING([for libcurl libs]) +CURLLIBS=`pkg-config libcurl --libs || curl-config --libs` +AS_IF([ test "$?" -eq 0 ],,[AC_MSG_ERROR([libcurl was not found])] ) +AC_MSG_RESULT([$CURLLIBS]) -AC_PROG_CC() AC_PROG_INSTALL() AC_PROG_OCAML() AC_PROG_FINDLIB() @@ -19,8 +24,6 @@ INSTALLDIR=$OCAMLLIB/curl AC_PREFIX_PROGRAM(ocamlc) -AC_SUBST(CURLDIR) -AC_SUBST(CURLFLAGS) AC_SUBST(CURLLIBS) AC_SUBST(OCAMLLIB) AC_SUBST(INSTALLDIR) diff --git a/examples/OMakefile b/examples/OMakefile deleted file mode 100644 index 5dab22f..0000000 --- a/examples/OMakefile +++ /dev/null @@ -1,16 +0,0 @@ -OCAML_LIBS += ../curl -OCAML_CLIBS += ../libcurl-helper -OCAMLINCLUDES += .. -OCAML_LINK_FLAGS += -ccopt $(shell curl-config --libs) - -OCamlProgram(ocurl, ocurl) -OCamlProgram(oput, oput) -OCamlProgram(ominimal, ominimal) -OCamlProgram(ossl, ossl) - -.DEFAULT: ocurl$(EXE) oput$(EXE) ominimal$(EXE) ossl$(EXE) - -clean: - rm -f ocurl$(EXE) oput$(EXE) ominimal$(EXE) ossl$(EXE) - rm -f ocurl.opt$(EXE) oput.opt$(EXE) ominimal.opt$(EXE) ossl.opt$(EXE) - rm -f *.cm* *~ *.o -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocurl.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits