From cefb0a7a765661cd4f070e6587daeed2d556a6bf Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 8 Dec 2008 15:46:17 +0000
Subject: [PATCH] Got rid of Xorriso_with_regeX

---
 libisoburn/trunk/Makefile.am                     | 2 +-
 libisoburn/trunk/xorriso/compile_xorriso.sh      | 2 +-
 libisoburn/trunk/xorriso/xorriso_makefile_am.txt | 2 +-
 libisoburn/trunk/xorriso/xorriso_private.h       | 6 ------
 libisoburn/trunk/xorriso/xorriso_timestamp.h     | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libisoburn/trunk/Makefile.am b/libisoburn/trunk/Makefile.am
index d8f3b95e..2558b497 100644
--- a/libisoburn/trunk/Makefile.am
+++ b/libisoburn/trunk/Makefile.am
@@ -46,7 +46,7 @@ bin_PROGRAMS = \
 # 	cat xorriso/xorriso_buildstamp.h
 
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
-xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_with_maiN $(READLINE_DEF)
 xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
 xorriso_xorriso_SOURCES = \
 	xorriso/xorriso.h \
diff --git a/libisoburn/trunk/xorriso/compile_xorriso.sh b/libisoburn/trunk/xorriso/compile_xorriso.sh
index 49535b8c..0d978cda 100755
--- a/libisoburn/trunk/xorriso/compile_xorriso.sh
+++ b/libisoburn/trunk/xorriso/compile_xorriso.sh
@@ -92,7 +92,7 @@ date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_bu
 echo "Build timestamp   :  $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)"
 
 echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
-cc -I. -DXorriso_with_maiN -DXorriso_with_regeX $def_libreadline \
+cc -I. -DXorriso_with_maiN $def_libreadline \
   $warn_opts \
   $static_opts \
   $debug_opts \
diff --git a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
index a4e539cf..2c3b2072 100644
--- a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
+++ b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
@@ -16,7 +16,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 
 # No readline in the vanilla version because the necessary headers
 # are in a separate readline-development package.
-xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
 
 xorriso_xorriso_LDADD = $(THREAD_LIBS)
 
diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h
index f4f468aa..87718231 100644
--- a/libisoburn/trunk/xorriso/xorriso_private.h
+++ b/libisoburn/trunk/xorriso/xorriso_private.h
@@ -34,11 +34,7 @@
 #define Xorriso_build_timestamP "-none-given-"
 #endif
 
-
-/* Because regex_t is mentioned in struct XorrisO */
-#ifdef Xorriso_with_regeX
 #include <regex.h>
-#endif /* Xorriso_with_regeX */
 
 
 #define Smem_malloC malloc
@@ -310,10 +306,8 @@ struct XorrisO { /* the global context of xorriso */
  char eternal_problem_status_text[20];
 
  /* temporary search facilities */
-#ifdef Xorriso_with_regeX
  regex_t *re;
  regmatch_t match[1]; 
-#endif /* Xorriso_with_regeX */
  char **re_constants;
  int re_count;
  int re_fill;
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 878c22d5..e7023f6b 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.12.08.121106"
+#define Xorriso_timestamP "2008.12.08.154521"