From 55c8f1d964ad4b54c64c855671ab581e367fcfee Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 7 Oct 2010 11:49:41 +0000
Subject: [PATCH] Preparing for GNU xorriso to include libjte source

---
 libisoburn/burn_wrap.c      | 18 ++++++++++++++----
 xorriso/base_obj.c          | 11 +++++++++++
 xorriso/lib_mgt.c           | 11 +++++++++++
 xorriso/write_run.c         | 11 +++++++++++
 xorriso/xorriso_timestamp.h |  2 +-
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c
index 48c8b444..6b565ee0 100644
--- a/libisoburn/burn_wrap.c
+++ b/libisoburn/burn_wrap.c
@@ -31,10 +31,6 @@
 #include <time.h>
 #include <regex.h>
 
-#ifdef Xorriso_with_libjtE
-#include <libjte/libjte.h>
-#endif
-
 #ifndef Xorriso_standalonE
 
 #include <libburn/libburn.h>
@@ -48,6 +44,20 @@
 
 #endif /* Xorriso_standalonE */
 
+/* >>> later change this to  Xorriso_standalonE */
+#ifdef Xorriso_jte_standalonE
+
+#ifdef Xorriso_with_libjtE
+#include "../libjte/libjte.h"
+#endif
+
+#else
+
+#ifdef Libisofs_with_libjtE
+#include <libjte/libjte.h>
+#endif
+
+#endif /* ! Xorriso_jte_standalonE */
 
 #include "libisoburn.h"
 #include "isoburn.h"
diff --git a/xorriso/base_obj.c b/xorriso/base_obj.c
index 68f0d5f5..b5e9176c 100644
--- a/xorriso/base_obj.c
+++ b/xorriso/base_obj.c
@@ -27,10 +27,21 @@
 #include <errno.h>
 #include <stdint.h>
 
+/* >>> later change this to  Xorriso_standalonE */
+#ifdef Xorriso_jte_standalonE
+
 #ifdef Xorriso_with_libjtE
+#include "../libjte/libjte.h"
+#endif
+
+#else
+
+#ifdef Libisofs_with_libjtE
 #include <libjte/libjte.h>
 #endif
 
+#endif /* ! Xorriso_jte_standalonE */
+
 #include "xorriso.h"
 #include "xorriso_private.h"
 
diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c
index 61d44fdd..7cab3e85 100644
--- a/xorriso/lib_mgt.c
+++ b/xorriso/lib_mgt.c
@@ -29,10 +29,21 @@
 #include <iconv.h>
 #include <langinfo.h>
 
+/* >>> later change this to  Xorriso_standalonE */
+#ifdef Xorriso_jte_standalonE
+
 #ifdef Xorriso_with_libjtE
+#include "../libjte/libjte.h"
+#endif
+
+#else
+
+#ifdef Libisofs_with_libjtE
 #include <libjte/libjte.h>
 #endif
 
+#endif /* ! Xorriso_jte_standalonE */
+
 #include "xorriso.h" 
 #include "xorriso_private.h"
 #include "xorrisoburn.h"
diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index 54cc888a..ff4e59fc 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -27,10 +27,21 @@
 #include <fcntl.h>
 #include <stdint.h>
 
+/* >>> later change this to  Xorriso_standalonE */
+#ifdef Xorriso_jte_standalonE
+
 #ifdef Xorriso_with_libjtE
+#include "../libjte/libjte.h"
+#endif
+
+#else
+
+#ifdef Libisofs_with_libjtE
 #include <libjte/libjte.h>
 #endif
 
+#endif /* ! Xorriso_jte_standalonE */
+
 #include "xorriso.h"
 #include "xorriso_private.h"
 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index a1e9c9c1..3ae193f9 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.10.06.162230"
+#define Xorriso_timestamP "2010.10.07.114916"