augeas 0.3.4 → 0.3.5
raw patch · 10 files changed
+232/−201 lines, 10 filessetup-changedPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- ChangeLog +15/−0
- HUnitAug.hs +16/−14
- Makefile +16/−15
- Setup.hs +19/−17
- System/Augeas.hs +18/−16
- System/AugeasHsc.hsc +18/−16
- THANKS +1/−0
- augeas.cabal +1/−1
- configure +127/−121
- configure.ac +1/−1
ChangeLog view
@@ -1,3 +1,18 @@+2011-02-12 Jude Nagurney <jude@pwan-central>++ * Released version 0.3.5+ * Updated source comment heads to refer to LGPL instead of GPL.+ * Added nomeata's Set-test-buildDir.patch+ * Handed off Debian packaging to the DHG+ * Updated spec file based on bugzilla.redhat.org comments++2010-11-19 Jude Nagurney <jude@pwan.org>++ * Released version 0.3.4+ * Changed license from GPL to LGPL+ * Add Fedora and Debian packaging source+ * Added 'CPP' extension to augeas.cabal+ 2010-10-24 Jude Nagurney <jude@pwan.org> * Released version 0.3.3
HUnitAug.hs view
@@ -1,20 +1,22 @@ -- file: HUnitAug.hs -- Haskell bindings for the Augeas library--- Copyright (c) 2009-2010, Jude Nagurney------ This program is free software; you can redistribute it and/or modify it--- under the terms of the GNU General Public License as published by the Free--- Software Foundation; either version 2 of the License, or (at your option)--- any later version.------ This program is distributed in the hope that it will be useful, but--- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or--- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.------ You should have received a copy of the GNU General Public License along with this program;--- if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,--- MA 02111-1307 USA+-- Copyright (c) 2009-2011, Jude Nagurney++-- This library is free software; you can redistribute it and/or modify it +-- under the terms of the GNU Lesser General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version.++-- This library is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +-- License for more details.++-- You should have received a copy of the GNU Lesser General Public License +-- along with this library; if not, write to the Free Software Foundation, +-- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + -- -- Contact the author at -- jude@pwan.org
Makefile view
@@ -1,21 +1,22 @@ ## file: Makefile ## Haskell bindings for the Augeas library-## Copyright (c) 2009-2010, Jude Nagurney-##-## This program is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by the Free -## Software Foundation; either version 2 of the License, or (at your option) -## any later version.-##-## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.-##-## You should have received a copy of the GNU General Public License along with this program; -## if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -## MA 02111-1307 USA-## +## Copyright (c) 2009-2011, Jude Nagurney++## This library is free software; you can redistribute it and/or modify it +## under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation; either version 3 of the License, or +## (at your option) any later version.++## This library is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +## License for more details.++## You should have received a copy of the GNU Lesser General Public License +## along with this library; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ## Contact the author at ## jude@pwan.org
Setup.hs view
@@ -3,27 +3,29 @@ -- file: Setup.hs -- Haskell bindings for the Augeas library--- Copyright (c) 2009-2010, Jude Nagurney------ This program is free software; you can redistribute it and/or modify it --- under the terms of the GNU General Public License as published by the Free --- Software Foundation; either version 2 of the License, or (at your option) --- any later version.------ This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.------ You should have received a copy of the GNU General Public License along with this program; --- if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, --- MA 02111-1307 USA--- +-- Copyright (c) 2009-2011 Jude Nagurney++-- This library is free software; you can redistribute it and/or modify it +-- under the terms of the GNU Lesser General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version.++-- This library is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +-- License for more details.++-- You should have received a copy of the GNU Lesser General Public License +-- along with this library; if not, write to the Free Software Foundation, +-- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + -- Contact the author at -- jude@pwan.org import Data.List (isInfixOf) import Distribution.PackageDescription import Distribution.Simple+import Distribution.Simple.LocalBuildInfo (buildDir) import System.Process -- main = defaultMain@@ -32,8 +34,8 @@ main = defaultMainWithHooks autoconfUserHooks { runTests = _runTests, instHook = _instHook } where -- Run all executables with names that end in -tests- _runTests _ _ pd _ = do- let exeNames = ["dist/build/" ++ fp ++ "/" ++ fp | fp <- map exeName (executables pd)]+ _runTests _ _ pd lbi = do+ let exeNames = [buildDir lbi ++ "/" ++ fp ++ "/" ++ fp | fp <- map exeName (executables pd)] sequence [_runTest e | e <- exeNames, isInfixOf "test-" e] return () _runTest fp = do
System/Augeas.hs view
@@ -1,23 +1,25 @@ -- file: System/Augeas.hs -- Haskell bindings for the Augeas library--- Copyright (c) 2009-2010, Jude Nagurney------ This program is free software; you can redistribute it and/or modify it --- under the terms of the GNU General Public License as published by the Free --- Software Foundation; either version 2 of the License, or (at your option) --- any later version.------ This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.+-- Copyright (c) 2009-2011, Jude Nagurney++-- This library is free software; you can redistribute it and/or modify it +-- under the terms of the GNU Lesser General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version.++-- This library is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +-- License for more details.++-- You should have received a copy of the GNU Lesser General Public License +-- along with this library; if not, write to the Free Software Foundation, +-- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ----- You should have received a copy of the GNU General Public License along with this program; --- if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, --- MA 02111-1307 USA--- --- Contact the author at --- jude@pwan.org +-- Contact the author at+-- jude@pwan.org {-# LANGUAGE CPP, ForeignFunctionInterface #-}
System/AugeasHsc.hsc view
@@ -1,23 +1,25 @@ -- file: Augeas.hsc -- Haskell bindings for the Augeas library--- Copyright (c) 2009-2010, Jude Nagurney------ This program is free software; you can redistribute it and/or modify it --- under the terms of the GNU General Public License as published by the Free --- Software Foundation; either version 2 of the License, or (at your option) --- any later version.------ This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.+-- Copyright (c) 2009-2011, Jude Nagurney++-- This library is free software; you can redistribute it and/or modify it +-- under the terms of the GNU Lesser General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version.++-- This library is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +-- License for more details.++-- You should have received a copy of the GNU Lesser General Public License +-- along with this library; if not, write to the Free Software Foundation, +-- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ----- You should have received a copy of the GNU General Public License along with this program; --- if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, --- MA 02111-1307 USA--- --- Contact the author at --- jude@pwan.org +-- Contact the author at+-- jude@pwan.org {-# LANGUAGE CPP, ForeignFunctionInterface #-}
THANKS view
@@ -3,5 +3,6 @@ "Dear Amigo - Dear Partner. Listen, uh - I just want to say thanks. So...thanks." Gwern Branwen <gwen0@gmail.com> (Contributions)+Joachim Breitner <nomeata@debian.org> (Contributions / Debian Packaging) John Calcote <jon.calcote@gmail.com> (Autotools book) Don Stewart <dons@galois.com> (Reporting a Bug / Real World Haskell)
augeas.cabal view
@@ -1,5 +1,5 @@ Name: augeas-Version: 0.3.4+Version: 0.3.5 Synopsis: A Haskell FFI wrapper for the Augeas API Description: A Haskell FFI wrapper for the Augeas API Author: Jude Nagurney
configure view
@@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles.-# Generated by GNU Autoconf 2.65 for haskell-augeas 0.3.4.+# Generated by GNU Autoconf 2.67 for haskell-augeas 0.3.5. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,-# Inc.+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software+# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation@@ -316,7 +316,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs"- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p@@ -356,19 +356,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD]-# ---------------------------------+# as_fn_error STATUS ERROR [LINENO LOG_FD]+# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the-# script with status $?, using 1 if that was 0.+# script with STATUS, using 1 if that was 0. as_fn_error () {- as_status=$?; test $as_status -eq 0 && as_status=1- if test "$3"; then- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3+ as_status=$1; test $as_status -eq 0 && as_status=1+ if test "$4"; then+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi- $as_echo "$as_me: error: $1" >&2+ $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -530,7 +530,7 @@ exec 6>&1 # Name of the host.-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -549,8 +549,8 @@ # Identity of this package. PACKAGE_NAME='haskell-augeas' PACKAGE_TARNAME='haskell-augeas'-PACKAGE_VERSION='0.3.4'-PACKAGE_STRING='haskell-augeas 0.3.4'+PACKAGE_VERSION='0.3.5'+PACKAGE_STRING='haskell-augeas 0.3.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -717,8 +717,9 @@ fi case $ac_option in- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;- *) ac_optarg=yes ;;+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;+ *=) ac_optarg= ;;+ *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos.@@ -763,7 +764,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error "invalid feature name: $ac_useropt"+ as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -789,7 +790,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error "invalid feature name: $ac_useropt"+ as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -993,7 +994,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error "invalid package name: $ac_useropt"+ as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -1009,7 +1010,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&- as_fn_error "invalid package name: $ac_useropt"+ as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in@@ -1039,8 +1040,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option'-Try \`$0 --help' for more information."+ -*) as_fn_error $? "unrecognized option: \`$ac_option'+Try \`$0 --help' for more information" ;; *=*)@@ -1048,7 +1049,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* )- as_fn_error "invalid variable name: \`$ac_envvar'" ;;+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;;@@ -1066,13 +1067,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'`- as_fn_error "missing argument to $ac_option"+ as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;;- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi@@ -1095,7 +1096,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host'@@ -1109,8 +1110,8 @@ 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+ $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@@ -1125,9 +1126,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||- as_fn_error "working directory cannot be determined"+ as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||- as_fn_error "pwd does not report name of working directory"+ as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified.@@ -1166,11 +1167,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`(- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then@@ -1196,7 +1197,7 @@ # 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 haskell-augeas 0.3.4 to adapt to many kinds of systems.+\`configure' configures haskell-augeas 0.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1210,7 +1211,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit- -q, --quiet, --silent do not print \`checking...' messages+ -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files@@ -1257,7 +1258,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in- short | recursive ) echo "Configuration of haskell-augeas 0.3.4:";;+ short | recursive ) echo "Configuration of haskell-augeas 0.3.5:";; esac cat <<\_ACEOF @@ -1342,10 +1343,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF-haskell-augeas configure 0.3.4-generated by GNU Autoconf 2.65+haskell-augeas configure 0.3.5+generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc.+Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF@@ -1461,7 +1462,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5- test $ac_status = 0; } >/dev/null && {+ test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then :@@ -1485,10 +1486,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :+ if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; }-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :+if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3@@ -1524,7 +1525,7 @@ else ac_header_preproc=no fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1551,7 +1552,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; }-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :+if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler"@@ -1615,7 +1616,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; }-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :+if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -1640,8 +1641,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by haskell-augeas $as_me 0.3.4, which was-generated by GNU Autoconf 2.65. Invocation command line was+It was created by haskell-augeas $as_me 0.3.5, which was+generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1751,11 +1752,9 @@ { echo - cat <<\_ASBOX-## ---------------- ##+ $as_echo "## ---------------- ## ## Cache variables. ##-## ---------------- ##-_ASBOX+## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, (@@ -1789,11 +1788,9 @@ ) echo - cat <<\_ASBOX-## ----------------- ##+ $as_echo "## ----------------- ## ## Output variables. ##-## ----------------- ##-_ASBOX+## ----------------- ##" echo for ac_var in $ac_subst_vars do@@ -1806,11 +1803,9 @@ echo if test -n "$ac_subst_files"; then- cat <<\_ASBOX-## ------------------- ##+ $as_echo "## ------------------- ## ## File substitutions. ##-## ------------------- ##-_ASBOX+## ------------------- ##" echo for ac_var in $ac_subst_files do@@ -1824,11 +1819,9 @@ fi if test -s confdefs.h; then- cat <<\_ASBOX-## ----------- ##+ $as_echo "## ----------- ## ## confdefs.h. ##-## ----------- ##-_ASBOX+## ----------- ##" echo cat confdefs.h echo@@ -1883,7 +1876,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then- ac_site_file1=$CONFIG_SITE+ # We do not want a PATH search for config.site.+ case $CONFIG_SITE in #((+ -*) ac_site_file1=./$CONFIG_SITE;;+ */*) ac_site_file1=$CONFIG_SITE;;+ *) ac_site_file1=./$CONFIG_SITE;;+ esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site@@ -1898,7 +1896,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5- . "$ac_site_file"+ . "$ac_site_file" \+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}+as_fn_error $? "failed to load site script $ac_site_file+See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -1974,7 +1976,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ##@@ -2300,8 +2302,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-as_fn_error "no acceptable C compiler found in \$PATH-See \`config.log' for more details." "$LINENO" 5; }+as_fn_error $? "no acceptable C compiler found in \$PATH+See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5@@ -2415,9 +2417,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-{ as_fn_set_status 77-as_fn_error "C compiler cannot create executables-See \`config.log' for more details." "$LINENO" 5; }; }+as_fn_error 77 "C compiler cannot create executables+See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; }@@ -2459,8 +2460,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-as_fn_error "cannot compute suffix of executables: cannot compile and link-See \`config.log' for more details." "$LINENO" 5; }+as_fn_error $? "cannot compute suffix of executables: cannot compile and link+See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5@@ -2517,9 +2518,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-as_fn_error "cannot run C compiled programs.+as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'.-See \`config.log' for more details." "$LINENO" 5; }+See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi@@ -2570,8 +2571,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-as_fn_error "cannot compute suffix of object files: cannot compile-See \`config.log' for more details." "$LINENO" 5; }+as_fn_error $? "cannot compute suffix of object files: cannot compile+See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi@@ -2893,7 +2894,7 @@ # Broken: fails on valid input. continue fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how.@@ -2909,11 +2910,11 @@ ac_preproc_ok=: break fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.-rm -f conftest.err conftest.$ac_ext+rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi@@ -2952,7 +2953,7 @@ # Broken: fails on valid input. continue fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how.@@ -2968,18 +2969,18 @@ ac_preproc_ok=: break fi-rm -f conftest.err conftest.$ac_ext+rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.-rm -f conftest.err conftest.$ac_ext+rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}-as_fn_error "C preprocessor \"$CPP\" fails sanity check-See \`config.log' for more details." "$LINENO" 5; }+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check+See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c@@ -3040,7 +3041,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP@@ -3106,7 +3107,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP@@ -3238,8 +3239,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default "-eval as_val=\$$as_ac_Header- if test "x$as_val" = x""yes; then :+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF@@ -3264,11 +3264,11 @@ done else- as_fn_error "Unable to find aug_init in an augeas library." "$LINENO" 5+ as_fn_error $? "Unable to find aug_init in an augeas library." "$LINENO" 5 fi if test "x${has_augeas_h}" = "xno"; then- as_fn_error "Unable to find augeas.h." "$LINENO" 5+ as_fn_error $? "Unable to find augeas.h." "$LINENO" 5 fi ## Checking for specific augeas lib functions.@@ -3333,7 +3333,7 @@ if test "x${has_augeas_close}" = "xno" ; then- as_fn_error "Unable to find aug_close in an augeas library." "$LINENO" 5+ as_fn_error $? "Unable to find aug_close in an augeas library." "$LINENO" 5 fi ## Treat all the rest of the API calls as potentially missing@@ -4518,6 +4518,7 @@ ac_libobjs= ac_ltlibobjs=+U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'@@ -4679,19 +4680,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD]-# ---------------------------------+# as_fn_error STATUS ERROR [LINENO LOG_FD]+# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the-# script with status $?, using 1 if that was 0.+# script with STATUS, using 1 if that was 0. as_fn_error () {- as_status=$?; test $as_status -eq 0 && as_status=1- if test "$3"; then- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3+ as_status=$1; test $as_status -eq 0 && as_status=1+ if test "$4"; then+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi- $as_echo "$as_me: error: $1" >&2+ $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -4887,7 +4888,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs"- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p@@ -4940,8 +4941,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log="-This file was extended by haskell-augeas $as_me 0.3.4, which was-generated by GNU Autoconf 2.65. Invocation command line was+This file was extended by haskell-augeas $as_me 0.3.5, which was+generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS@@ -4993,11 +4994,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\-haskell-augeas config.status 0.3.4-configured by $0, generated by GNU Autoconf 2.65,+haskell-augeas config.status 0.3.5+configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc.+Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5012,11 +5013,16 @@ while test $# != 0 do case $1 in- --*=*)+ --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;;+ --*=)+ ac_option=`expr "X$1" : 'X\([^=]*\)='`+ ac_optarg=+ ac_shift=:+ ;; *) ac_option=$1 ac_optarg=$2@@ -5043,7 +5049,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header- as_fn_error "ambiguous option: \`$1'+ as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;;@@ -5052,7 +5058,7 @@ ac_cs_silent=: ;; # This is an error.- -*) as_fn_error "unrecognized option: \`$1'+ -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1"@@ -5103,7 +5109,7 @@ case $ac_config_target in "Config.h") CONFIG_HEADERS="$CONFIG_HEADERS Config.h" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -5139,7 +5145,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp")-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS.@@ -5161,7 +5167,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi@@ -5246,7 +5252,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1- as_fn_error "could not setup config headers machinery" "$LINENO" 5+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -5259,7 +5265,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);;- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac@@ -5287,7 +5293,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac ||- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'"@@ -5314,7 +5320,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac@@ -5389,19 +5395,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \- || as_fn_error "could not create $ac_file" "$LINENO" 5+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \- || as_fn_error "could not create $ac_file" "$LINENO" 5+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \- || as_fn_error "could not create -" "$LINENO" 5+ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; @@ -5416,7 +5422,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 ||- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status.@@ -5437,7 +5443,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction.- $ac_cs_success || as_fn_exit $?+ $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
configure.ac view
@@ -1,5 +1,5 @@ AC_PREREQ(2.65)-AC_INIT([haskell-augeas],[0.3.4])+AC_INIT([haskell-augeas],[0.3.5]) AC_CONFIG_SRCDIR(Setup.hs) AC_CONFIG_HEADERS([Config.h])