Make configure SED environment aware, e.g. for OSX (Robert William Fuller). Get ready for release 0.90

2 files changed, 16 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index f38f1721..5ebb7395 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,22 @@
 version 0.90
+2012-10-27
 - CD-Text overhaul and API change (Leon Merten Lohse)
-- Works again on MinGW; tolerence for Microsoft's C compiler (Pete Batard)
+- Works again (somewhat) on MinGW; tolerence for Microsoft's C compiler (Pete Batard)
 - UDF, Joliet and Rock-Ridge fixes (Pete Batard)
-- OSX fixes
+- OSX fixes (Natalia Portillo and Robert William Fuller)
 - paranoia library removed as that is GPL 2-ish. This is now a separate project
 - file names in cue files are relative to the cue file rather than cwd.
 - Update mmc.h to include MMC-5 commands. (Or MMC-6 since it adds nothing new)
 - Add mmc_cmd2str() to show MMC command name. Show that in some errors
-- Add UDF reading to iso-read and iso-info via --udf or -U
+- Add UDF reading to iso-read and iso-info via --udf or -U (Christophe Fergeau)
 - bug fixes, more tests, update documentation
 
 version 0.83
 2011-10-27
 
-- Add retrieval SCSI sense reply from the most-recent MMC command.
+- Add retrieval SCSI sense reply from the most-recent MMC command. (Thomas Schmitt)
 - Add exclusive read/write access for devices which is used for experimental
-  writing/burning. Currently only on GNU/Linux and FreeBSD.
+  writing/burning. Currently only on GNU/Linux and FreeBSD.  (Thomas Schmitt)
 - MMC bug fixes
 - FreeBSD drive list now shows empty drives.
 - Add ability to retrieve SCSI tuple for a name and/or fake one up for
diff --git a/configure.ac b/configure.ac
index 95877c63..b6108840 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 dnl 02110-1301 USA.
 
 define(RELEASE_NUM, 90)
-define(CDIO_VERSION_STR, 0.$1git)
+define(CDIO_VERSION_STR, 0.$1)
 
 AC_PREREQ(2.61)
 
@@ -322,16 +322,17 @@ AC_SUBST(LIBISO9660_LIBS)
 AC_SUBST(LIBUDF_LIBS)
 
 AC_MSG_CHECKING([Checking what sed uses for extended regular expressions])
+test -n "$SED" || SED=$ac_path_SED
 SED_EXTENDED_RE_FLAG='-r'
-result=$(echo 'define' | $ac_path_SED -r -e 's/^define/foo/' 2>/dev/null)
+result=$(echo 'define' | $SED -r -e 's/^define/foo/' 2>/dev/null)
 if [[ $? -ne 0 ]] ; then
-   result=$(echo 'define' | $ac_path_SED -r -E 's/^define/foo/' 2>/dev/null)
-   if [[ $? -ne 0 ]] ; then
-     SED_EXTENDED_RE_FLAG='-E'
-   else 
-     AC_MSG_WARN([Don't have SED that understand extended RE's. Some minor compilation issues may fail.])
-     SED_EXTENDED_RE_FLAG=''
-   fi   
+    result=$(echo 'define' | $SED -E -e 's/^define/foo/' 2>/dev/null)
+    if [[ $? -eq 0 ]] ; then
+        SED_EXTENDED_RE_FLAG='-E'
+    else
+        AC_MSG_WARN([Don't have SED that understand extended RE's. Some minor compilation issues may fail.])
+        SED_EXTENDED_RE_FLAG=''
+    fi
 fi
 AC_MSG_RESULT($SED_EXTENDED_RE_FLAG)
 AC_SUBST(SED_EXTENDED_RE_FLAG)