From a462de30c19a67a9befbf15d7efe878e4608ffa2 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 15 Jun 2010 16:05:55 +0000
Subject: [PATCH] Enabled use of libreadline on Solaris by eventually linking
 -lcurses

---
 libisoburn/trunk/acinclude.m4                | 50 +++++++++++++++-----
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/libisoburn/trunk/acinclude.m4 b/libisoburn/trunk/acinclude.m4
index a977db4c..728f5845 100644
--- a/libisoburn/trunk/acinclude.m4
+++ b/libisoburn/trunk/acinclude.m4
@@ -81,7 +81,12 @@ AC_DEFUN([LIBBURNIA_CHECK_ICONV],
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 ], [], [libburnia_iconv_const=""], [libburnia_iconv_const="const"]
   )
-  AC_DEFINE_UNQUOTED([ICONV_CONST], [$libburnia_iconv_const])
+  if test x$libburnia_iconv_const = xconst
+  then
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [const])
+  else
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [])
+  fi
   test -z "$libburnia_iconv_const" && libburnia_iconv_const="no"
   AC_MSG_RESULT([$libburnia_iconv_const])
 ])
@@ -131,16 +136,11 @@ iconv_close(cd);
 ])
 
 
-dnl LIBBURNIA_ASSERT_READLINE disables xorriso readline if not all needed
-dnl functions are present
-AC_DEFUN([LIBBURNIA_ASSERT_READLINE],
+dnl LIBBURNIA_TRY_READLINE is by Thomas Schmitt, libburnia project
+dnl It performs the actual test compilation for readline.
+dnl Variable LIBS has to be set by the caller.
+AC_DEFUN([LIBBURNIA_TRY_READLINE],
 [
-  if test x$XORRISO_ASSUME_READLINE = x
-  then
-    dnl Check for the essential gestures of libisofs/util.c
-    AC_MSG_CHECKING([for desired functions in libreadline])
-    libburnia_save_LIBS="$LIBS"
-    LIBS="$LIBS -lreadline"
     AC_TRY_LINK([
 #include <ctype.h>
 #include <sys/types.h>
@@ -156,17 +156,43 @@ add_history("");
 hl= history_list();
 ], [readline_test="yes"], [readline_test="no"]
     )
-    AC_MSG_RESULT([$readline_test])
+])
+
+
+dnl LIBBURNIA_ASSERT_READLINE is by Thomas Schmitt, libburnia project
+dnl It disables xorriso readline if not all needed functions are present
+AC_DEFUN([LIBBURNIA_ASSERT_READLINE],
+[
+  if test x$XORRISO_ASSUME_READLINE = x
+  then
+    dnl Check for the essential gestures of libisofs/util.c
+    AC_MSG_CHECKING([for desired functions in libreadline])
+    readline_msg=
+    libburnia_save_LIBS="$LIBS"
+    LIBS="$LIBS -lreadline"
+    LIBBURNIA_TRY_READLINE
+    if test x$readline_test = xno
+    then
+        LIBS="$libburnia_save_LIBS"
+        LIBS="$LIBS -lreadline -lcurses"
+        LIBBURNIA_TRY_READLINE
+        if test x$readline_test = xyes
+        then
+            readline_msg=", with -lcurses"
+        fi
+    fi
     if test x$readline_test = xno
     then
         READLINE_DEF=
         LIBS="$libburnia_save_LIBS"
     fi
+    AC_MSG_RESULT([$readline_test $readline_msg])
   fi
 ])
 
 
-dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file.
+dnl LIBBURNIA_SET_PKGCONFIG is by Thomas Schmitt, libburnia project
+dnl It determines the install directory for the *.pc file.
 dnl Important: Must be performed _after_ TARGET_SHIZZLE
 dnl
 AC_DEFUN([LIBBURNIA_SET_PKGCONFIG],
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 7bbf189c..7240280a 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.06.15.160133"
+#define Xorriso_timestamP "2010.06.15.160501"