diff --git a/COPYING b/COPYING --- a/COPYING +++ b/COPYING @@ -1,29 +1,121 @@ - +Statement of Purpose - - - HsSVN - - - phonohawk - - - - - - - - - - +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). - +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/ChangeLog b/ChangeLog new file mode 100644 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,101 @@ +2013-10-01 PHO + + * Subversion/Hash.hsc: Fix breakage on newer GHC. + + * cbits/HsSVN.h: Fix breakage on newer Subversion. + + * COPYING: Change the license of HsSVN from PublicDomain to CC0: a + strong form of public domain. + + * README.rst: New file. + + * configure.ac: Add option --with-subversion-prefix=PREFIX, + deprecating EXTRA_CPPFLAGS and EXTRA_LIBS. + + * HsSVN.cabal (Source-Repository): Migrate from darcs to git. + + * HsSVN.cabal (Version): Bump version to 0.4.3.3 + +2011-07-28 PHO + + * HsSVN-0.4.3.2: Fix breakage on newer GHC and other libraries. + +2010-08-06 PHO + + * INSTALL: New file that describes how to build this abnormal + package which everyone fails to build. Believe me, it's + Subversion's fault. It offers no svn-config, no subversion.pc, and + no subversion.m4. + + * configure: small bugfix + + * HsSVN.cabal: Bump version to 0.4.3.1 + +2010-02-19 PHO + + * HsSVN-0.4.3: Fixed a serious bug which leads to segmentation + fault at apr_hash_next. The hidden module Subversion.Hash was + misusing APR memory pools. + +2010-02-04 PHO + + * HsSVN-0.4.2: Fix breakage on GHC 6.12.1. + +2009-02-20 PHO + + * HsSVN.cabal: Fix incorrect dependency declarations. + + * HsSVN.cabal: Bump version to 0.4.1 + +2009-01-16 PHO + + * HsSVN-0.4: Fix breakage on GHC 6.10.1. And now it requires + 6.10.1... + +2008-07-20 PHO + + * configure.ac: Search for apr-1-config and apu-1-config as well. + + * HsSVN.cabal: Bump version to 0.3.3 + +2008-03-29 PHO + + * Subversion/Repository.hsc (dumpRepository): Fix the + infinite-loop bug again... Hopefully it works now. + + * HsSVN.cabal: Bump version to 0.3.2 + +2008-03-29 PHO + + * Subversion/Repository.hsc (dumpRepository): Fix a bug causing an + infinite-loop. + + * HsSVN.cabal: Bump version to 0.3.1 + +2008-03-27 PHO + + * Subversion/Repository.hsc (dumpRepository): New function. + + * Subversion/FileSystem/Revision.hsc (getRevisionNumber): New + function. + + * Subversion/FileSystem/Revision.hsc (getRevisionProp): Rename to + getRevisionProp' + + * Subversion/FileSystem/Revision.hsc (getRevisionPropList): Rename + to getRevisionPropList' + + * Subversion/FileSystem/Revision.hsc (getRevisionProp): New + function. + + * Subversion/FileSystem/Revision.hsc (getRevisionPropList): New + function. + +2007-11-05 PHO + + * HsSVN-0.2: Fix breakage on GHC 6.8.1 and now it requires GHC + 6.8.1. + +2007-08-25 PHO + + * HsSVN-0.1: Initial release. diff --git a/HsSVN.cabal b/HsSVN.cabal --- a/HsSVN.cabal +++ b/HsSVN.cabal @@ -1,24 +1,41 @@ Name: HsSVN Synopsis: Partial Subversion (SVN) binding for Haskell Description: - HsSVN is a partial Subversion (SVN) binding for Haskell. Currently it - can do most things related to the Subversion FS but others are - left uncovered. -Version: 0.4.3.2 + . + HsSVN is a partial Subversion (SVN) binding for Haskell. Currently + it covers the most part of Subversion FS but others are left + uncovered. + . + Please note that you need to pass an extra option to @cabal + configure@ to build HsSVN (assuming you have installed Subversion + to @\/usr\/local@): + . + > cabal configure --configure-option="--with-subversion-prefix=/usr/local" + > cabal build + > cabal install + . + You need the following external libraries to be installed: + . + * apr, apr-util >= 1.3 () + . + * subversion >= 1.6 () + . +Version: 0.4.3.3 License: PublicDomain License-File: COPYING Author: PHO Maintainer: PHO Stability: experimental -Homepage: http://cielonegro.org/HsSVN.html -Category: System -Tested-With: GHC == 6.12.1 +Homepage: https://github.com/phonohawk/HsSVN +Bug-Reports: https://github.com/phonohawk/HsSVN/issues +Category: System, Development +Tested-With: GHC == 7.6.2 Cabal-Version: >= 1.6 Build-Type: Configure Extra-Source-Files: + ChangeLog HsSVN.buildinfo.in - INSTALL - NEWS + README.rst cbits/HsSVN.h configure configure.ac @@ -26,15 +43,15 @@ examples/HelloWorld.hs Source-Repository head - Type: darcs - Location: http://darcs.cielonegro.org/HsSVN/ + Type: git + Location: git://github.com/phonohawk/HsSVN.git Library Build-Depends: - base == 4.3.*, - bytestring == 0.9.*, - mtl == 2.0.*, - stm == 2.2.* + base == 4.*, + bytestring >= 0.9 && < 0.11, + mtl >= 2.0 && < 2.2, + stm >= 2.2 && < 2.5 Exposed-Modules: Subversion Subversion.Config @@ -53,7 +70,7 @@ Subversion.Stream Subversion.Stream.Pipe Subversion.String - GHC-Options: + GHC-Options: -Wall C-Sources: cbits/HsSVN.c diff --git a/INSTALL b/INSTALL deleted file mode 100644 --- a/INSTALL +++ /dev/null @@ -1,54 +0,0 @@ -.. -*- rst -*- - -==================== -How to install HsSVN -==================== - -HsSVN's installation steps are quite irregular, due to libsvn's nature -of library user unfriendliness. - - -Required external libraries ---------------------------- - -* `apr `_ >= 1.3 -* `apr-util `_ >= 1.3 -* `subversion `_ >= 1.6 - - -Building HsSVN --------------- - -You have to first figure out where SVN's header files are installed. -In this document we assume they are in ``/usr/local`` like this:: - - /usr/local/bin/apr-1-config - /usr/local/bin/apu-1-config - /usr/local/bin/svn - /usr/local/bin/svnadmin - ... - /usr/local/include/apr-1/apr.h - ... - /usr/local/include/subversion-1/svn_auth.h - /usr/local/include/subversion-1/svn_base64.h - /usr/local/include/subversion-1/svn_checksum.h - ... - /usr/local/lib/libsvn_client-1.la - /usr/local/lib/libsvn_client-1.a - /usr/local/lib/libsvn_client-1.so - /usr/local/lib/libsvn_client-1.so.0 - /usr/local/lib/libsvn_client-1.so.0.0.0 - /usr/local/lib/libsvn_delta-1.la - /usr/local/lib/libsvn_delta-1.a - /usr/local/lib/libsvn_delta-1.so - /usr/local/lib/libsvn_delta-1.so.0 - /usr/local/lib/libsvn_delta-1.so.0.0.0 - ... - -Then pass those paths to the ./Setup.hs script like this:: - - % env EXTRA_CPPFLAGS="-I/usr/local/include/subversion-1" \ - EXTRA_LDFLAGS="-L/usr/local/lib" \ - runhaskell Setup.hs configure - % runhaskell Setup.hs build - % runhaskell Setup.hs install diff --git a/NEWS b/NEWS deleted file mode 100644 --- a/NEWS +++ /dev/null @@ -1,71 +0,0 @@ -Changes from 0.4.3.1 to 0.4.3.2 -------------------------------- -* Fixed breakage on newer GHC and other libraries. - - -Changes from 0.4.3 to 0.4.3.1 ------------------------------ -* INSTALL: - - New file that describes how to build this abnormal package which - everyone fails to build. Believe me. It's Subversion's fault. It - offers no svn-config, no subversion.pc, and no subversion.m4. - -* configure: a small bugfix - -* Brushed up my poor English documentation. - - -Changes from 0.4.2 to 0.4.3 ---------------------------- -* Fixed a serious bug which leads to segmentation fault at - apr_hash_next. The hidden module Subversion.Hash was handling APR - memory pools wrongly. - - -Changes from 0.4.1 to 0.4.2 ---------------------------- -* Fixed breakage on GHC 6.12.1. - - -Changes from 0.4 to 0.4.1 -------------------------- -* Fixed incorrect dependency declaration in HsSVN.cabal. No semantical - changes to the code. - -Changes from 0.3.3 to 0.4 -------------------------- -* Fixed breakage on GHC 6.10.1. And now it requires 6.10.1... - -Changes from 0.3.2 to 0.3.3 ---------------------------- -* configure: - - Fixed to search apr-1-config and apu-1-config as well. - -Changes from 0.3.1 to 0.3.2 ---------------------------- -* Subversion.Repository: - - Fixed dumpRepository bug again... Hopefully it works now. - - -Changes from 0.3 to 0.3.1 -------------------------- -* Subversion.Repository: - - Fixed dumpRepository bug which causes infinite-loop. - - -Changes from 0.2 to 0.3 ------------------------ -* Subversion.Repository: - - Added new function: dumpRepository - -* Subversion.FileSystem.Revision: - - Added new function: getRevisionNumber - - Renamed function: getRevisionProp ==> getRevisionProp' - - Renamed function: getRevisionPropList ==> getRevisionPropList' - - Added new function: getRevisionProp - - Added new function: getRevisionPropList - - -Changes from 0.1 to 0.2 ------------------------ -* HsSVN now requires GHC 6.8.1 diff --git a/README.rst b/README.rst new file mode 100644 --- /dev/null +++ b/README.rst @@ -0,0 +1,9 @@ +====== +README +====== + +HsSVN is a partial Subversion (SVN) binding for Haskell. Currently it +covers the most part of Subversion FS but others are left uncovered. + +You can download release archives from Hackage: +http://hackage.haskell.org/package/HsSVN diff --git a/Subversion/Error.hsc b/Subversion/Error.hsc --- a/Subversion/Error.hsc +++ b/Subversion/Error.hsc @@ -25,13 +25,17 @@ , SvnErrCode(..) ) where +import Control.Exception +import Data.Typeable +import Foreign.C.String +import Foreign.C.Types +import Foreign.ForeignPtr +import Foreign.Marshal.Array +import Foreign.Ptr +import Foreign.Storable +import Subversion.Types +import System.IO.Unsafe -import Control.Exception -import Data.Typeable -import Foreign -import Foreign.C.String -import Foreign.C.Types -import Subversion.Types -- |@'SvnError'@ represents a Subversion error. newtype SvnError diff --git a/Subversion/Hash.hsc b/Subversion/Hash.hsc --- a/Subversion/Hash.hsc +++ b/Subversion/Hash.hsc @@ -1,6 +1,7 @@ {-# LANGUAGE DeriveDataTypeable , EmptyDataDecls + , FlexibleInstances , ForeignFunctionInterface , TypeSynonymInstances #-} @@ -34,7 +35,8 @@ import Control.Monad import Foreign.C.String import Foreign.C.Types -import Foreign.ForeignPtr +import Foreign.ForeignPtr hiding (unsafeForeignPtrToPtr) +import Foreign.ForeignPtr.Unsafe import Foreign.Marshal.Alloc import Foreign.Marshal.Utils hiding (new) import Foreign.Ptr diff --git a/cbits/HsSVN.h b/cbits/HsSVN.h --- a/cbits/HsSVN.h +++ b/cbits/HsSVN.h @@ -8,6 +8,7 @@ #include #include #include +#include /* initialization ************************************************************ */ int HsSVN_initialize(); diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -602,12 +622,12 @@ ac_subst_vars='LTLIBOBJS LIBOBJS -APU_CONFIG -APR_CONFIG -SVN_LIBS -SVN_CFLAGS EXTRA_LDFLAGS EXTRA_CPPFLAGS +SVN_LIBS +SVN_CFLAGS +APU_CONFIG +APR_CONFIG EGREP GREP CPP @@ -659,6 +679,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +with_subversion_prefix ' ac_precious_vars='build_alias host_alias @@ -669,10 +690,10 @@ LIBS CPPFLAGS CPP -EXTRA_CPPFLAGS -EXTRA_LDFLAGS APR_CONFIG -APU_CONFIG' +APU_CONFIG +EXTRA_CPPFLAGS +EXTRA_LDFLAGS' # Initialize some variables set by options. @@ -1128,8 +1149,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1278,6 +1297,12 @@ cat <<\_ACEOF +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-subversion-prefix=PREFIX + path to subversion headers and libraries [PREFIX] + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1287,12 +1312,12 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor - EXTRA_CPPFLAGS - extra CPPFLAGS to find subversion - EXTRA_LDFLAGS - extra LDFLAGS to find subversion APR_CONFIG apr-config to use APU_CONFIG apu-config to use + EXTRA_CPPFLAGS + (deprecated) + EXTRA_LDFLAGS + (deprecated) Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1361,9 +1386,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1636,7 +1661,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1726,7 +1751,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2098,7 +2123,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2138,7 +2163,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2191,7 +2216,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2232,7 +2257,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2290,7 +2315,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2334,7 +2359,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2780,8 +2805,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3023,7 +3047,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3089,7 +3113,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -3300,19 +3324,7 @@ # NOTE: we can get rid of these ugly checks when we got svn-config or # something alike. # -ac_old_CPPFLAGS="$CPPFLAGS" -ac_old_LDFLAGS="$LDFLAGS" - - -CPPFLAGS="$EXTRA_CPPFLAGS $CPPFLAGS" -LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" - -SVN_CFLAGS="$EXTRA_CPPFLAGS" -SVN_LIBS="$EXTRA_LIBS -lsvn_subr-1 -lsvn_repos-1 -lsvn_fs-1" - - - # apr for ac_prog in apr-config apr-1-config @@ -3333,7 +3345,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_APR_CONFIG="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3358,11 +3370,8 @@ done test -n "$APR_CONFIG" || APR_CONFIG="as_fn_error $? "apr-config is required. Hint: APR_CONFIG" "$LINENO" 5" -SVN_CFLAGS=`$APR_CONFIG --includes --cppflags`" $SVN_CFLAGS" -SVN_LIBS=`$APR_CONFIG --link-ld --libs`" $SVN_LIBS" - -CPPFLAGS=`$APR_CONFIG --includes --cppflags`" $CPPFLAGS" -LDFLAGS=`$APR_CONFIG --link-ld --libs`" $LDFLAGS" +SVN_CFLAGS="$SVN_CFLAGS "`$APR_CONFIG --includes --cppflags` +SVN_LIBS="$SVN_LIBS "`$APR_CONFIG --link-ld --libs` # apu @@ -3384,7 +3393,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_APU_CONFIG="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3409,31 +3418,59 @@ done test -n "$APU_CONFIG" || APU_CONFIG="as_fn_error $? "apu-config is required. Hint: APU_CONFIG" "$LINENO" 5" -SVN_CFLAGS=`$APU_CONFIG --includes`" $SVN_CFLAGS" -SVN_LIBS=`$APU_CONFIG --link-ld --libs`" $SVN_LIBS" - -CPPFLAGS=`$APU_CONFIG --includes`" $CPPFLAGS" -LDFLAGS=`$APU_CONFIG --link-ld --libs`" $LDFLAGS" +SVN_CFLAGS="$SVN_CFLAGS "`$APU_CONFIG --includes` +SVN_LIBS="$SVN_LIBS "`$APU_CONFIG --link-ld --libs` # svn -for ac_header in svn_error.h + +# Check whether --with-subversion-prefix was given. +if test "${with_subversion_prefix+set}" = set; then : + withval=$with_subversion_prefix; +fi + +case "$with_subversion_prefix" in #( + "yes"|"no"|"") : + with_subversion_prefix="$prefix" ;; #( + *) : + ;; +esac +SVN_CFLAGS="$SVN_CFLAGS -I$with_subversion_prefix/include/subversion-1" +SVN_LIBS=" \ + $SVN_LIBS \ + -L$with_subversion_prefix/lib \ + -Wl,-rpath -Wl,$with_subversion_prefix/lib \ + -lsvn_subr-1 -lsvn_repos-1 -lsvn_fs-1" + + + + + +SVN_CFLAGS="$SVN_CFLAGS $EXTRA_CPPFLAGS" +SVN_LIBS="$SVN_LIBS $EXTRA_LDFLAGS" + +ac_old_CPPFLAGS="$CPPFLAGS" +ac_old_LDFLAGS="$LDFLAGS" +CPPFLAGS="$CPPFLAGS $SVN_CFLAGS" +LDFLAGS="$LDFLAGS $SVN_LDFLAGS" + +for ac_header in svn_version.h do : - ac_fn_c_check_header_mongrel "$LINENO" "svn_error.h" "ac_cv_header_svn_error_h" "$ac_includes_default" -if test "x$ac_cv_header_svn_error_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "svn_version.h" "ac_cv_header_svn_version_h" "$ac_includes_default" +if test "x$ac_cv_header_svn_version_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SVN_ERROR_H 1 +#define HAVE_SVN_VERSION_H 1 _ACEOF else - as_fn_error $? "SVN headers are required. Hint: EXTRA_CPPFLAGS" "$LINENO" 5 + as_fn_error $? "SVN headers are required. Hint: --with-subversion-prefix=PREFIX" "$LINENO" 5 fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for svn_error_clear in -lsvn_subr-1" >&5 -$as_echo_n "checking for svn_error_clear in -lsvn_subr-1... " >&6; } -if ${ac_cv_lib_svn_subr_1_svn_error_clear+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for svn_subr_version in -lsvn_subr-1" >&5 +$as_echo_n "checking for svn_subr_version in -lsvn_subr-1... " >&6; } +if ${ac_cv_lib_svn_subr_1_svn_subr_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3447,27 +3484,27 @@ #ifdef __cplusplus extern "C" #endif -char svn_error_clear (); +char svn_subr_version (); int main () { -return svn_error_clear (); +return svn_subr_version (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svn_subr_1_svn_error_clear=yes + ac_cv_lib_svn_subr_1_svn_subr_version=yes else - ac_cv_lib_svn_subr_1_svn_error_clear=no + ac_cv_lib_svn_subr_1_svn_subr_version=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svn_subr_1_svn_error_clear" >&5 -$as_echo "$ac_cv_lib_svn_subr_1_svn_error_clear" >&6; } -if test "x$ac_cv_lib_svn_subr_1_svn_error_clear" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svn_subr_1_svn_subr_version" >&5 +$as_echo "$ac_cv_lib_svn_subr_1_svn_subr_version" >&6; } +if test "x$ac_cv_lib_svn_subr_1_svn_subr_version" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSVN_SUBR_1 1 _ACEOF @@ -3475,9 +3512,12 @@ LIBS="-lsvn_subr-1 $LIBS" else - as_fn_error $? "SVN libraries are required. Hint: EXTRA_LDFLAGS" "$LINENO" 5 + as_fn_error $? "SVN libraries are required. Hint: --with-subversion-prefix=PREFIX" "$LINENO" 5 fi + +CPPFLAGS="$ac_old_CPPFLAGS" +LDFLAGS="$ac_old_LDFLAGS" # # Done the ugly checks # @@ -3927,16 +3967,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -3996,29 +4036,17 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4039,7 +4067,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4092,10 +4120,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4172,7 +4200,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -22,30 +22,15 @@ # NOTE: we can get rid of these ugly checks when we got svn-config or # something alike. # -ac_old_CPPFLAGS="$CPPFLAGS" -ac_old_LDFLAGS="$LDFLAGS" -AC_ARG_VAR([EXTRA_CPPFLAGS], [extra CPPFLAGS to find subversion]) -AC_ARG_VAR([EXTRA_LDFLAGS], [extra LDFLAGS to find subversion]) -CPPFLAGS="$EXTRA_CPPFLAGS $CPPFLAGS" -LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" - -SVN_CFLAGS="$EXTRA_CPPFLAGS" -SVN_LIBS="$EXTRA_LIBS -lsvn_subr-1 -lsvn_repos-1 -lsvn_fs-1" -AC_SUBST([SVN_CFLAGS]) -AC_SUBST([SVN_LIBS]) - # apr AC_ARG_VAR([APR_CONFIG], [apr-config to use]) AC_CHECK_PROGS( [APR_CONFIG], [apr-config apr-1-config], [AC_MSG_ERROR([apr-config is required. Hint: APR_CONFIG])]) -SVN_CFLAGS=`$APR_CONFIG --includes --cppflags`" $SVN_CFLAGS" -SVN_LIBS=`$APR_CONFIG --link-ld --libs`" $SVN_LIBS" - -CPPFLAGS=`$APR_CONFIG --includes --cppflags`" $CPPFLAGS" -LDFLAGS=`$APR_CONFIG --link-ld --libs`" $LDFLAGS" +SVN_CFLAGS="$SVN_CFLAGS "`$APR_CONFIG --includes --cppflags` +SVN_LIBS="$SVN_LIBS "`$APR_CONFIG --link-ld --libs` # apu AC_ARG_VAR([APU_CONFIG], [apu-config to use]) @@ -53,23 +38,50 @@ [APU_CONFIG], [apu-config apu-1-config], [AC_MSG_ERROR([apu-config is required. Hint: APU_CONFIG])]) -SVN_CFLAGS=`$APU_CONFIG --includes`" $SVN_CFLAGS" -SVN_LIBS=`$APU_CONFIG --link-ld --libs`" $SVN_LIBS" - -CPPFLAGS=`$APU_CONFIG --includes`" $CPPFLAGS" -LDFLAGS=`$APU_CONFIG --link-ld --libs`" $LDFLAGS" +SVN_CFLAGS="$SVN_CFLAGS "`$APU_CONFIG --includes` +SVN_LIBS="$SVN_LIBS "`$APU_CONFIG --link-ld --libs` # svn +AC_ARG_WITH( + [subversion-prefix], + [AS_HELP_STRING( + [--with-subversion-prefix=PREFIX], + [path to subversion headers and libraries @<:@PREFIX@:>@])]) +AS_CASE( + ["$with_subversion_prefix"], + ["yes"|"no"|""], [with_subversion_prefix="$prefix"]) +SVN_CFLAGS="$SVN_CFLAGS -I$with_subversion_prefix/include/subversion-1" +SVN_LIBS=" \ + $SVN_LIBS \ + -L$with_subversion_prefix/lib \ + -Wl,-rpath -Wl,$with_subversion_prefix/lib \ + -lsvn_subr-1 -lsvn_repos-1 -lsvn_fs-1" +AC_SUBST([SVN_CFLAGS]) +AC_SUBST([SVN_LIBS]) + +AC_ARG_VAR([EXTRA_CPPFLAGS], [(deprecated)]) +AC_ARG_VAR([EXTRA_LDFLAGS], [(deprecated)]) +SVN_CFLAGS="$SVN_CFLAGS $EXTRA_CPPFLAGS" +SVN_LIBS="$SVN_LIBS $EXTRA_LDFLAGS" + +ac_old_CPPFLAGS="$CPPFLAGS" +ac_old_LDFLAGS="$LDFLAGS" +CPPFLAGS="$CPPFLAGS $SVN_CFLAGS" +LDFLAGS="$LDFLAGS $SVN_LDFLAGS" + AC_CHECK_HEADERS( - [svn_error.h], + [svn_version.h], [], - [AC_MSG_ERROR([SVN headers are required. Hint: EXTRA_CPPFLAGS])]) + [AC_MSG_ERROR([SVN headers are required. Hint: --with-subversion-prefix=PREFIX])]) AC_CHECK_LIB( [svn_subr-1], - [svn_error_clear], + [svn_subr_version], [], - [AC_MSG_ERROR([SVN libraries are required. Hint: EXTRA_LDFLAGS])]) + [AC_MSG_ERROR([SVN libraries are required. Hint: --with-subversion-prefix=PREFIX])]) + +CPPFLAGS="$ac_old_CPPFLAGS" +LDFLAGS="$ac_old_LDFLAGS" # # Done the ugly checks #