This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocurl.
commit a54ba670fb198568ed54afdebb8aee9eeb86dbcf Author: Stephane Glondu <st...@glondu.net> Date: Tue Feb 23 10:42:02 2016 +0100 Imported Upstream version 0.7.4 --- .gitignore | 2 ++ CHANGES.txt | 4 ++++ configure | 30 ++++++++++++++++++------------ configure.in | 12 ++++++++---- print_ext.ml | 2 -- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 89c304f..05775dd 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ examples/test_lwt examples/test_lwt_unit examples/test_memory_leaks /doc +/print_ext +/autom4te.cache diff --git a/CHANGES.txt b/CHANGES.txt index 67a6679..4b4e879 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +0.7.4 - 23 Jun 2015 + + * fix build + 0.7.3 - 22 Jun 2015 + CURLOPT_MAIL_FROM CURLOPT_MAIL_RCPT diff --git a/configure b/configure index 737e5e1..21069c5 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.7.3. +# Generated by GNU Autoconf 2.69 for ocurl 0.7.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ocurl' PACKAGE_TARNAME='ocurl' -PACKAGE_VERSION='0.7.3' -PACKAGE_STRING='ocurl 0.7.3' +PACKAGE_VERSION='0.7.4' +PACKAGE_STRING='ocurl 0.7.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1245,7 +1245,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.7.3 to adapt to many kinds of systems. +\`configure' configures ocurl 0.7.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1306,7 +1306,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ocurl 0.7.3:";; + short | recursive ) echo "Configuration of ocurl 0.7.4:";; esac cat <<\_ACEOF @@ -1386,7 +1386,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ocurl configure 0.7.3 +ocurl configure 0.7.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1684,7 +1684,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.7.3, which was +It was created by ocurl $as_me 0.7.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4188,9 +4188,15 @@ fi +if test "$OCAMLFIND" == "no"; then : + $OCAMLC -I +compiler-libs ocamlcommon.cma print_ext.ml -o print_ext +else + $OCAMLFIND c -linkpkg -package compiler-libs.common print_ext.ml -o print_ext +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ext_dll" >&5 $as_echo_n "checking for ext_dll... " >&6; } -EXT_DLL=`$OCAML print_ext.ml dll || $OCAMLC -config | fgrep ext_dll | sed -e "s/.*: //"` +EXT_DLL=`./print_ext dll || $OCAMLC -config | fgrep ext_dll | sed -e "s/.*: //"` if test "$?" -eq 0 ; then : else @@ -4201,7 +4207,7 @@ $as_echo "$EXT_DLL" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ext_lib" >&5 $as_echo_n "checking for ext_lib... " >&6; } -EXT_LIB=`$OCAML print_ext.ml lib || $OCAMLC -config | fgrep ext_lib | sed -e "s/.*: //"` +EXT_LIB=`./print_ext lib || $OCAMLC -config | fgrep ext_lib | sed -e "s/.*: //"` if test "$?" -eq 0 ; then : else @@ -4212,7 +4218,7 @@ $as_echo "$EXT_LIB" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ext_obj" >&5 $as_echo_n "checking for ext_obj... " >&6; } -EXT_OBJ=`$OCAML print_ext.ml obj || $OCAMLC -config | fgrep ext_obj | sed -e "s/.*: //"` +EXT_OBJ=`./print_ext obj || $OCAMLC -config | fgrep ext_obj | sed -e "s/.*: //"` if test "$?" -eq 0 ; then : else @@ -8647,7 +8653,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.7.3, which was +This file was extended by ocurl $as_me 0.7.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8709,7 +8715,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.7.3 +ocurl config.status 0.7.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 678fcd1..0d7e4f2 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl dnl ocurl autoconf input dnl -AC_INIT(ocurl,0.7.3) +AC_INIT(ocurl,0.7.4) AC_PROG_CC() @@ -32,18 +32,22 @@ AC_SUBST(INSTALLDIR) AC_SUBST(OCAMLFIND) AC_SUBST(OCAML_PKG_lwt) +AS_IF([test "$OCAMLFIND" == "no"], +[$OCAMLC -I +compiler-libs ocamlcommon.cma print_ext.ml -o print_ext], +[$OCAMLFIND c -linkpkg -package compiler-libs.common print_ext.ml -o print_ext]) + AC_MSG_CHECKING([for ext_dll]) -EXT_DLL=`$OCAML print_ext.ml dll || $OCAMLC -config | fgrep ext_dll | sed -e "s/.*: //"` +EXT_DLL=`./print_ext dll || $OCAMLC -config | fgrep ext_dll | sed -e "s/.*: //"` AS_IF([ test "$?" -eq 0 ],,[AC_MSG_ERROR([failed])] ) AC_MSG_RESULT([$EXT_DLL]) AC_MSG_CHECKING([for ext_lib]) -EXT_LIB=`$OCAML print_ext.ml lib || $OCAMLC -config | fgrep ext_lib | sed -e "s/.*: //"` +EXT_LIB=`./print_ext lib || $OCAMLC -config | fgrep ext_lib | sed -e "s/.*: //"` AS_IF([ test "$?" -eq 0 ],,[AC_MSG_ERROR([failed])] ) AC_MSG_RESULT([$EXT_LIB]) AC_MSG_CHECKING([for ext_obj]) -EXT_OBJ=`$OCAML print_ext.ml obj || $OCAMLC -config | fgrep ext_obj | sed -e "s/.*: //"` +EXT_OBJ=`./print_ext obj || $OCAMLC -config | fgrep ext_obj | sed -e "s/.*: //"` AS_IF([ test "$?" -eq 0 ],,[AC_MSG_ERROR([failed])] ) AC_MSG_RESULT([$EXT_OBJ]) diff --git a/print_ext.ml b/print_ext.ml index ad21dea..3a2f7ef 100644 --- a/print_ext.ml +++ b/print_ext.ml @@ -1,5 +1,3 @@ -#use "topfind";; -#require "compiler-libs.common";; match List.tl (Array.to_list Sys.argv) with | ["dll"] -> print_endline Config.ext_dll | ["obj"] -> print_endline Config.ext_obj -- 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