From 25f1eab3ac01b13f0feaf09d9efac8624172405b Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 15 Oct 2010 12:55:03 +0000
Subject: [PATCH] United macro Xorriso_jte_standalonE with macro
 Xorriso_standalonE

---
 libisoburn/burn_wrap.c      | 17 ++++-------------
 xorriso/base_obj.c          |  5 ++---
 xorriso/configure_ac.txt    |  5 -----
 xorriso/lib_mgt.c           |  5 ++---
 xorriso/xorriso_timestamp.h |  2 +-
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c
index ffdbdada..f6056b23 100644
--- a/libisoburn/burn_wrap.c
+++ b/libisoburn/burn_wrap.c
@@ -34,30 +34,21 @@
 #ifndef Xorriso_standalonE
 
 #include <libburn/libburn.h>
-
 #include <libisofs/libisofs.h>
+#ifdef Xorriso_with_libjtE
+#include <libjte/libjte.h>
+#endif
 
 #else /* ! Xorriso_standalonE */
 
 #include "../libisofs/libisofs.h"
 #include "../libburn/libburn.h"
-
-#endif /* Xorriso_standalonE */
-
-/* >>> later change this to  Xorriso_standalonE */
-#ifdef Xorriso_jte_standalonE
-
 #ifdef Xorriso_with_libjtE
 #include "../libjte/libjte.h"
 #endif
 
-#else
+#endif /* Xorriso_standalonE */
 
-#ifdef Xorriso_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 4fd0f376..c530fd12 100644
--- a/xorriso/base_obj.c
+++ b/xorriso/base_obj.c
@@ -27,8 +27,7 @@
 #include <errno.h>
 #include <stdint.h>
 
-/* >>> later change this to  Xorriso_standalonE */
-#ifdef Xorriso_jte_standalonE
+#ifdef Xorriso_standalonE
 
 #ifdef Xorriso_with_libjtE
 #include "../libjte/libjte.h"
@@ -40,7 +39,7 @@
 #include <libjte/libjte.h>
 #endif
 
-#endif /* ! Xorriso_jte_standalonE */
+#endif /* ! Xorriso_standalonE */
 
 #include "xorriso.h"
 #include "xorriso_private.h"
diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt
index 15c63db7..ebd4ac3c 100644
--- a/xorriso/configure_ac.txt
+++ b/xorriso/configure_ac.txt
@@ -247,11 +247,6 @@ if test x$ZLIB_DEF = xyes
 then
     AC_DEFINE([Xorriso_with_libjtE], [])
     AC_DEFINE([Libisofs_with_libjtE], [])
-
-# >>> Only until built-in libjte becomes default with xorriso-standalone
-    AH_TEMPLATE([Xorriso_jte_standalonE], [Preliminary switch])
-    AC_DEFINE([Xorriso_jte_standalonE], [])
-
     LIBJTE_DEF=yes
     echo "enabled  built-in libjte"
 else
diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c
index 157ca13c..915f1233 100644
--- a/xorriso/lib_mgt.c
+++ b/xorriso/lib_mgt.c
@@ -29,8 +29,7 @@
 #include <iconv.h>
 #include <langinfo.h>
 
-/* >>> later change this to  Xorriso_standalonE */
-#ifdef Xorriso_jte_standalonE
+#ifdef Xorriso_standalonE
 
 #ifdef Xorriso_with_libjtE
 #include "../libjte/libjte.h"
@@ -42,7 +41,7 @@
 #include <libjte/libjte.h>
 #endif
 
-#endif /* ! Xorriso_jte_standalonE */
+#endif /* ! Xorriso_standalonE */
 
 #include "xorriso.h" 
 #include "xorriso_private.h"
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 29c67408..77a9e362 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.10.15.121533"
+#define Xorriso_timestamP "2010.10.15.125440"