diff --git a/configure.ac b/configure.ac
index 4d79e47d..c318eeaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 73)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.142 2005/02/06 15:09:10 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.143 2005/02/18 23:49:45 rocky Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 
@@ -471,6 +471,7 @@ if test x$enable_joliet = xyes; then
      AC_DEFINE(HAVE_JOLIET, [1], 
      [Define 1 if you want ISO-9660 Joliet extension support. 
      You must have also libiconv installed to get Joliet extension support.])
+     HAVE_JOLIET=1
   else
      AC_MSG_WARN([You must have iconv installed to get Joliet extension support.])
   fi
diff --git a/test/check_iso.sh.in b/test/check_iso.sh.in
index c3bfa307..a12a9372 100644
--- a/test/check_iso.sh.in
+++ b/test/check_iso.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_iso.sh.in,v 1.5 2005/01/29 14:50:34 rocky Exp $
+#$Id: check_iso.sh.in,v 1.6 2005/02/18 23:49:45 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
@@ -14,12 +14,17 @@ fi
 BASE=`basename $0 .sh`
 fname=copying
 
-if test -n "@HAVE_JOLIET@" ; then
-  opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
-  test_iso_info  "$opts" ${fname}.dump ${srcdir}/${fname}.right
-  RC=$?
-  check_result $RC 'iso-info basic test' "$ISO_INFO $opts"
+opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
+test_iso_info  "$opts" ${fname}.dump ${srcdir}/${fname}.right
+RC=$?
+check_result $RC 'iso-info basic test' "$ISO_INFO $opts"
 
+opts="--image ${srcdir}/${fname}.iso --extract $fname "
+test_iso_read  "$opts" ${fname} ${srcdir}/../COPYING
+RC=$?
+check_result $RC 'iso-read basic test' "$ISO_READ $opts"
+
+if test -n "@HAVE_JOLIET@" ; then
   BASE=`basename $0 .sh`
   fname=joliet
   opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
@@ -33,11 +38,6 @@ if test -n "@HAVE_JOLIET@" ; then
   check_result $RC 'iso-info --no-joliet test' "$cmdline"
 fi
 
-opts="--image ${srcdir}/${fname}.iso --extract $fname "
-test_iso_read  "$opts" ${fname} ${srcdir}/../COPYING
-RC=$?
-check_result $RC 'iso-read test 1' "$ISO_READ $opts"
-
 exit $RC
 
 #;;; Local Variables: ***
diff --git a/test/copying.right b/test/copying.right
index 6d82353f..a672232d 100644
--- a/test/copying.right
+++ b/test/copying.right
@@ -4,7 +4,7 @@ PARTICULAR PURPOSE.
 __________________________________
 ISO-9660 Information
 /:
- Jan 10 2004 00:47  .
- Jan 10 2004 00:47  ..
- Jan 10 2004 00:47  copying
+     2048 Jan 10 2004 00:47  .
+     2048 Jan 10 2004 00:47  ..
+    17992 Jan 10 2004 00:47  copying
 
diff --git a/test/joliet-nojoliet.right b/test/joliet-nojoliet.right
index 6128af6a..541fd839 100644
--- a/test/joliet-nojoliet.right
+++ b/test/joliet-nojoliet.right
@@ -1,23 +1,12 @@
+Error getting above directory information
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 ISO-9660 Information
 /:
- Oct 22 2004 18:44  .
- Oct 22 2004 18:44  ..
- Oct 22 2004 18:44  libcdio
-
-/LIBCDIO/:
- Oct 22 2004 18:44  .
- Oct 22 2004 18:44  ..
- Mar 12 2004 02:18  copying
- Jun 26 2004 06:01  readme
- Aug 12 2004 05:22  readme.libcdio
- Oct 22 2004 18:44  test
-
-/LIBCDIO/TEST/:
- Oct 22 2004 18:44  .
- Oct 22 2004 18:44  ..
- Jul 25 2004 05:52  isofs_m1.cue
+     2048 Oct 22 2004 18:44  .
+     2048 Oct 22 2004 18:44  ..
+     2048 Oct 22 2004 18:44  libcdio
 
+/libcdio/:
diff --git a/test/joliet.right b/test/joliet.right
index 71844c8e..de537536 100644
--- a/test/joliet.right
+++ b/test/joliet.right
@@ -4,20 +4,20 @@ PARTICULAR PURPOSE.
 __________________________________
 ISO-9660 Information
 /:
- Oct 22 2004 18:44  .
- Oct 22 2004 18:44  ..
- Oct 22 2004 18:44  libcdio
+     2048 Oct 22 2004 18:44  .
+     2048 Oct 22 2004 18:44  ..
+     2048 Oct 22 2004 18:44  libcdio
 
 /libcdio/:
- Oct 22 2004 18:44  .
- Oct 22 2004 18:44  ..
- Mar 12 2004 02:18  COPYING
- Jun 26 2004 06:01  README
- Aug 12 2004 05:22  README.libcdio
- Oct 22 2004 18:44  test
+     2048 Oct 22 2004 18:44  .
+     2048 Oct 22 2004 18:44  ..
+    17992 Mar 12 2004 02:18  COPYING
+     2156 Jun 26 2004 06:01  README
+     2849 Aug 12 2004 05:22  README.libcdio
+     2048 Oct 22 2004 18:44  test
 
 /libcdio/test/:
- Oct 22 2004 18:44  .
- Oct 22 2004 18:44  ..
- Jul 25 2004 05:52  isofs-m1.cue
+     2048 Oct 22 2004 18:44  .
+     2048 Oct 22 2004 18:44  ..
+       74 Jul 25 2004 05:52  isofs-m1.cue