This is supposed to be sorted

Change-Id: Id29ccc9c009f0db5f1ee7483c412bb18578c24d3

1 files changed, 52 insertions, 53 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index f780655d36be..cacc4e0e6e57 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -20,15 +20,15 @@ export ALIGNOF_LONG=@ALIGNOF_LONG@
 export ALIGNOF_SHORT=@ALIGNOF_SHORT@
 export ALLOC=@ALLOC@
 export ALL_LANGS=@ALL_LANGS@
-export ANT=@ANT@
-export ANT_HOME=@ANT_HOME@
-export ANT_LIB=@ANT_LIB@
 export ANCIENT_BISON=@ANCIENT_BISON@
 export ANDROID_APP_ABI=@ANDROID_APP_ABI@
+export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@
 export ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=@ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR@
-export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
+export ANT=@ANT@
+export ANT_HOME=@ANT_HOME@
+export ANT_LIB=@ANT_LIB@
 export AR=@AR@
 export ASSERT_ALWAYS_ABORT=@ASSERT_ALWAYS_ABORT@
 export ATL_INCLUDE=@ATL_INCLUDE@
@@ -62,7 +62,6 @@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@
 export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@
 export COM=@COM@
-export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
 export COMEX=@COMEX@
 export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
 export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
@@ -72,6 +71,7 @@ export COMPATH=@COMPATH@
 export COMPILER_PLUGINS=@COMPILER_PLUGINS@
 export COMP_ENV=@OUTPATH@
 export COM_FOR_BUILD=@COM_FOR_BUILD@
+export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
 export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPU=@CPU@
@@ -92,7 +92,6 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
 export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
-export debug=@ENABLE_DEBUG@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
@@ -100,15 +99,15 @@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
 export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
 export DISABLE_ATL=@DISABLE_ATL@
+export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_EXPORT=@DISABLE_EXPORT@
 export DISABLE_EXTENSIONS=@DISABLE_EXTENSIONS@
-export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
 export DISABLE_LINKOO=@DISABLE_LINKOO@
 export DISABLE_NEON=@DISABLE_NEON@
-export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
+export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
 export DLLTOOL=@DLLTOOL@
 export DMAKEROOT=@SRC_ROOT@/solenv/inc/startup
 export DOCDIR=@DOCDIR@
@@ -117,11 +116,11 @@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DPKG=@DPKG@
 export DYNAMIC_CRT=@DYNAMIC_CRT@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
-export ENABLE_DBUS=@ENABLE_DBUS@
-export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
+export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
 export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@
 export ENABLE_DIRECTX=@ENABLE_DIRECTX@
@@ -129,7 +128,6 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_GCONF=@ENABLE_GCONF@
 export ENABLE_GIO=@ENABLE_GIO@
 export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
-export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
@@ -137,8 +135,6 @@ export ENABLE_GTK3=@ENABLE_GTK3@
 export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
 export ENABLE_HEADLESS=@ENABLE_HEADLESS@
-export ENABLE_TDEAB=@ENABLE_TDEAB@
-export ENABLE_TDE=@ENABLE_TDE@
 export ENABLE_KAB=@ENABLE_KAB@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_KDE=@ENABLE_KDE@
@@ -153,20 +149,23 @@ export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@
 export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@
 export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
+export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@
 export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
-export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
-export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SCRIPTING_PYTHON=@ENABLE_SCRIPTING_PYTHON@
+export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
+export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
 export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
 export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
+export ENABLE_TDE=@ENABLE_TDE@
+export ENABLE_TDEAB=@ENABLE_TDEAB@
 export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_ZENITY=@ENABLE_ZENITY@
@@ -174,6 +173,7 @@ export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
 export EXTMSV80=$(gb_Space)@EXTMSV80@
+export debug=@ENABLE_DEBUG@
 @x_Cygwin@ export FIND=@WIN_FIND@
 export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
 export FLEX=@FLEX@
@@ -189,9 +189,9 @@ export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
 export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
 export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
-export PARALLELISM?=@PARALLELISM@
 export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
 export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
+export PARALLELISM?=@PARALLELISM@
 @x_GNUCP@ export GNUCOPY=@GNUCP@
 export GNUMAKE=@GNUMAKE@
 export GNUPATCH=@GNUPATCH@
@@ -204,10 +204,10 @@ export GPERF=@GPERF@
 export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@
 export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@
 @x_Cygwin@ export GREP=@WIN_GREP@
-export GSTREAMER_CFLAGS=$(gb_SPACE)@GSTREAMER_CFLAGS@
-export GSTREAMER_LIBS=$(gb_SPACE)@GSTREAMER_LIBS@
 export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
 export GSTREAMER_0_10_LIBS=$(gb_SPACE)@GSTREAMER_0_10_LIBS@
+export GSTREAMER_CFLAGS=$(gb_SPACE)@GSTREAMER_CFLAGS@
+export GSTREAMER_LIBS=$(gb_SPACE)@GSTREAMER_LIBS@
 export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@
 export GTHREAD_LIBS=$(gb_SPACE)@GTHREAD_LIBS@
 export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
@@ -223,22 +223,22 @@ export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_CXX0X=@HAVE_CXX0X@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
-export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
 export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
-export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@
 export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
 export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
+export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@
+export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
 export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@
 export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
 export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
-export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
-export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@
 export HAVE_GETOPT=@HAVE_GETOPT@
+export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_READDIR_R=@HAVE_READDIR_R@
+export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@
 export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
 export HOST_PLATFORM=@host@
 export HSQLDB_JAR=@HSQLDB_JAR@
@@ -252,32 +252,30 @@ export ICECREAM_RUN=@ICECREAM_RUN@
 export ICU_MAJOR=@ICU_MAJOR@
 export ICU_MICRO=@ICU_MICRO@
 export ICU_MINOR=@ICU_MINOR@
-export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
 export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@
 export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
+export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
 export ILIB=@ILIB@
 export INPATH=@INPATH@
 export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BITMAP=@INTRO_BITMAP@
-export JAVAIFLAGS=@JAVAIFLAGS@
-export JAVAINTERPRETER=@JAVAINTERPRETER@
 export JAVACISGCJ=@JAVACISGCJ@
 export JAVACISKAFFE=@JAVACISKAFFE@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
+export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVAINTERPRETER=@JAVAINTERPRETER@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
 export JAVA_TARGET_VER=@JAVA_TARGET_VER@
 export JDK=@JDK@
 @x_JDKLIB@ export JDKLIB=@JDKLIB@
-export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
+export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
-export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@
-export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@
 export KDE4_CFLAGS=$(gb_SPACE)@KDE4_CFLAGS@
 export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
 export KDE_CFLAGS=$(gb_SPACE)@KDE_CFLAGS@
@@ -298,15 +296,15 @@ export LIBEXTTEXTCAT_CFLAGS=$(gb_SPACE)@LIBEXTTEXTCAT_CFLAGS@
 export LIBEXTTEXTCAT_LIBS=$(gb_SPACE)@LIBEXTTEXTCAT_LIBS@
 export LIBFONTS_JAR=@LIBFONTS_JAR@
 export LIBFORMULA_JAR=@LIBFORMULA_JAR@
-export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
 export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
+export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
 export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
 export LIBMYSQL_PATH=@LIBMYSQL_PATH@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
-export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
+export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
 export LIBO_VERSION_PATCH=@LIBO_VERSION_PATCH@
 export LIBPNG_CFLAGS=$(gb_SPACE)@LIBPNG_CFLAGS@
 export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@
@@ -320,7 +318,6 @@ export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
 export LIBXSLT_MAJOR=@LIBXSLT_MAJOR@
 export LINK_X64_BINARY=@LINK_X64_BINARY@
 @x_Cygwin@ export LS=@WIN_LS@
-export MANDIR=@MANDIR@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
@@ -329,6 +326,7 @@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
 export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
 export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
 export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@
+export MANDIR=@MANDIR@
 export MD5SUM=@MD5SUM@
 export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
 export MERGELIBS=@MERGELIBS@
@@ -384,8 +382,8 @@ export MINGW_REDLAND_DLL=@MINGW_REDLAND_DLL@
 export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
 export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
 export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
-export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@
 export MINGW_SMIME3_DLL=@MINGW_SMIME3_DLL@
+export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@
 export MINGW_SSH2_DLL=@MINGW_SSH2_DLL@
 export MINGW_SSL3_DLL=@MINGW_SSL3_DLL@
 export MINGW_SSL_DLL=@MINGW_SSL_DLL@
@@ -398,34 +396,35 @@ export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
 export MOC=@MOC@
 export MSM_PATH=@MSM_PATH@
-export MSVC_DLL_PATH=@MSVC_DLL_PATH@
-export MSVC_DLLS=@MSVC_DLLS@
-export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
 export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
 export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
-export MSVC80_MNFST=@MSVC80_MNFST@
 export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@
+export MSVC80_MNFST=@MSVC80_MNFST@
+export MSVC_DLLS=@MSVC_DLLS@
+export MSVC_DLL_PATH=@MSVC_DLL_PATH@
+export MYSQLC_MAJOR=@MYSQLC_MAJOR@
+export MYSQLC_MICRO=@MYSQLC_MICRO@
+export MYSQLC_MINOR=@MYSQLC_MINOR@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
-export MYSQLC_MAJOR=@MYSQLC_MAJOR@
-export MYSQLC_MINOR=@MYSQLC_MINOR@
-export MYSQLC_MICRO=@MYSQLC_MICRO@
 export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
 export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
 export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@
 export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@
 export NEON_VERSION=@NEON_VERSION@
 export NM=@NM@
-export nodep=@nodep@
+export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
+export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
+export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
 export NSS_MAJOR=@NSS_MAJOR@
 export NSS_MINOR=@NSS_MINOR@
 export NSS_PATCH=@NSS_PATCH@
-export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
-export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
 export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
+export nodep=@nodep@
 @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
 @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
+export EXTRA_BUILDID=@EXTRA_BUILDID@
 export OBJDUMP=@OBJDUMP@
 export OOODMAKEMODE=YES
 export OOOP_FONTS_PACK=@OOOP_FONTS_PACK@
@@ -434,7 +433,6 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
 export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_SHELL=@BASH@
-export EXTRA_BUILDID=@EXTRA_BUILDID@
 export OOO_VENDOR=@OOO_VENDOR@
 export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
 export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
@@ -462,13 +460,13 @@ export PREFIXDIR=@PREFIXDIR@
 export PRODUCT=@PRODUCT@
 export PRODUCTNAME=@PRODUCTNAME@
 export PRODUCTVERSION=@PRODUCTVERSION@
+export PROEXT=@PROEXT@
 export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@
 export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@
-export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@
-export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@
 export PROGRESSPOSITION=@PROGRESSPOSITION@
 export PROGRESSSIZE=@PROGRESSSIZE@
-export PROEXT=@PROEXT@
+export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@
+export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@
 export PSPRINT=TRUE
 export PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 export PTHREAD_LIBS=@PTHREAD_LIBS@
@@ -476,19 +474,19 @@ export PYTHON=@PYTHON@
 export PYTHON_CFLAGS=$(gb_SPACE)@PYTHON_CFLAGS@
 export PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
 export PYTHON_LIBS=$(gb_SPACE)@PYTHON_LIBS@
+export PYTHON_VERSION=@PYTHON_VERSION@
 export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@
 export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
-export PYTHON_VERSION=@PYTHON_VERSION@
 export RANLIB=@RANLIB@
-export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@
-export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@
 export RAPTOR_MAJOR=@RAPTOR_MAJOR@
 export RASQAL_MAJOR=@RASQAL_MAJOR@
+export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@
+export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@
 export REDLAND_MAJOR=@REDLAND_MAJOR@
 export RHINO_JAR=@RHINO_JAR@
 export RPM=@RPM@
-export RTL_OS=@RTL_OS@
 export RTL_ARCH=@RTL_ARCH@
+export RTL_OS=@RTL_OS@
 export SAC_JAR=@SAC_JAR@
 export SAL_ENABLE_FILE_LOCKING=1
 export SCPDEFS=@SCPDEFS@
@@ -564,11 +562,11 @@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
 export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
 export SYSTEM_MDDS=@SYSTEM_MDDS@
 export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
-export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@
 export SYSTEM_MYSQL=@SYSTEM_MYSQL@
 export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@
 export SYSTEM_MYTHES=@SYSTEM_MYTHES@
 export SYSTEM_NEON=@SYSTEM_NEON@
+export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@
 export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
@@ -584,6 +582,8 @@ export SYSTEM_UCPP=@SYSTEM_UCPP@
 export SYSTEM_VIGRA=@SYSTEM_VIGRA@
 export SYSTEM_ZLIB=@SYSTEM_ZLIB@
 export TARFILE_LOCATION=@TARFILE_LOCATION@
+export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@
+export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@
 export TELEPATHY_CFLAGS=$(gb_SPACE)@TELEPATHY_CFLAGS@
 export TELEPATHY_LIBS=$(gb_SPACE)@TELEPATHY_LIBS@
 export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
@@ -594,8 +594,8 @@ export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
 export UPD=@UPD@
 export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
-export use_shl_version=@use_shl_version@
 export USE_XINERAMA=@USE_XINERAMA@
+export use_shl_version=@use_shl_version@
 export UUIDGEN=@UUIDGEN@
 export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@
 export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
@@ -612,7 +612,6 @@ export WINDRES=@WINDRES@
 export WINEGCC=@WINEGCC@
 export WITHOUT_AFMS=@WITHOUT_AFMS@
 export WITHOUT_PPDS=@WITHOUT_PPDS@
-#export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
 export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
 export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
 export WITH_EXTRA_EXTENSIONS=@WITH_EXTRA_EXTENSIONS@