Preparing for GNU xorriso to include libjte source

libisoburn/trunk/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"

libisoburn/trunk/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"
 

libisoburn/trunk/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"

libisoburn/trunk/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"
 

libisoburn/trunk/xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2010.10.06.162230"
+#define Xorriso_timestamP "2010.10.07.114916"