migrate most SYSTEM_* config from set_soenv.in to config_host.mk.in

should be pretty safe.
The main risk if is something rely on the 'undef if empty' behavior of
the typical trap is the use of *= in dmake
a git grep of "\$(SYSTEM_" did not reveal any problematic case.

2 files changed, 60 insertions, 60 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 35b9779c8291..4a5b7ac370e4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -3,3 +3,63 @@
  # or to be sourced in a shell session
  #
 export SRC_ROOT="@SRC_ROOT@"
+export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
+export SYSTEM_BOOST="@SYSTEM_BOOST@"
+export SYSTEM_BSH="@SYSTEM_BSH@"
+export SYSTEM_CAIRO="@SYSTEM_CAIRO@"
+export SYSTEM_CPPUNIT="@SYSTEM_CPPUNIT@"
+export SYSTEM_CURL="@SYSTEM_CURL@"
+export SYSTEM_DB="@SYSTEM_DB@"
+export SYSTEM_DB_CFLAGS="@SYSTEM_DB_CFLAGS@"
+export SYSTEM_DICTS="@SYSTEM_DICTS@"
+export SYSTEM_EXPAT="@SYSTEM_EXPAT@"
+export SYSTEM_GDKPIXBUF="@SYSTEM_GDKPIXBUF@"
+export SYSTEM_GENBRK="@SYSTEM_GENBRK@"
+export SYSTEM_GENCCODE="@SYSTEM_GENCCODE@"
+export SYSTEM_GENCMN="@SYSTEM_GENCMN@"
+export SYSTEM_GETTEXT="@SYSTEM_GETTEXT@"
+export SYSTEM_GLIB="@SYSTEM_GLIB@"
+export SYSTEM_GRAPHITE="@SYSTEM_GRAPHITE@"
+export SYSTEM_HSQLDB="@SYSTEM_HSQLDB@"
+export SYSTEM_HUNSPELL="@SYSTEM_HUNSPELL@"
+export SYSTEM_HYPH="@SYSTEM_HYPH@"
+export SYSTEM_ICU="@SYSTEM_ICU@"
+export SYSTEM_JFREEREPORT="@SYSTEM_JFREEREPORT@"
+export SYSTEM_JPEG="@SYSTEM_JPEG@"
+export SYSTEM_LIBC="@SYSTEM_LIBC@"
+export SYSTEM_LIBCDR="@SYSTEM_LIBCDR@"
+export SYSTEM_LIBCMIS="@SYSTEM_LIBCMIS@"
+export SYSTEM_LIBCROCO="@SYSTEM_LIBCROCO@"
+export SYSTEM_LIBEXTTEXTCAT="@SYSTEM_LIBEXTTEXTCAT@"
+export SYSTEM_LIBEXTTEXTCAT_DATA="@SYSTEM_LIBEXTTEXTCAT_DATA@"
+export SYSTEM_LIBGSF="@SYSTEM_LIBGSF@"
+export SYSTEM_LIBJPEG="@SYSTEM_LIBJPEG@"
+export SYSTEM_LIBPNG="@SYSTEM_LIBPNG@"
+export SYSTEM_LIBRSVG="@SYSTEM_LIBRSVG@"
+export SYSTEM_LIBVISIO="@SYSTEM_LIBVISIO@"
+export SYSTEM_LIBWPD="@SYSTEM_LIBWPD@"
+export SYSTEM_LIBWPG="@SYSTEM_LIBWPG@"
+export SYSTEM_LIBWPS="@SYSTEM_LIBWPS@"
+export SYSTEM_LIBXML="@SYSTEM_LIBXML@"
+export SYSTEM_LPSOLVE="@SYSTEM_LPSOLVE@"
+export SYSTEM_LUCENE="@SYSTEM_LUCENE@"
+export SYSTEM_MDDS="@SYSTEM_MDDS@"
+export SYSTEM_MESA_HEADERS="@SYSTEM_MESA_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_NSS="@SYSTEM_NSS@"
+export SYSTEM_ODBC_HEADERS="@SYSTEM_ODBC_HEADERS@"
+export SYSTEM_OPENSSL="@SYSTEM_OPENSSL@"
+export SYSTEM_PANGO="@SYSTEM_PANGO@"
+export SYSTEM_POPPLER="@SYSTEM_POPPLER@"
+export SYSTEM_POSTGRESQL="@SYSTEM_POSTGRESQL@"
+export SYSTEM_REDLAND="@SYSTEM_REDLAND@"
+export SYSTEM_SAMPLEICC="@SYSTEM_SAMPLEICC@"
+export SYSTEM_SANE_HEADER="@SYSTEM_SANE_HEADER@"
+export SYSTEM_SAXON="@SYSTEM_SAXON@"
+export SYSTEM_SERVLETAPI="@SYSTEM_SERVLETAPI@"
+export SYSTEM_STDLIBS="@SYSTEM_STDLIBS@"
+export SYSTEM_VIGRA="@SYSTEM_VIGRA@"
+export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
diff --git a/set_soenv.in b/set_soenv.in
index 1a765cdcf089..ab1cdaee89be 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1396,7 +1396,6 @@ ToFile( "BUILD_MOZAB",       "@BUILD_MOZAB@",    "e" );
 ToFile( "PREBUILD_MOZAB",    $PREBUILD_MOZAB,    "e" );
 ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
 ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
-ToFile( "SYSTEM_NSS",  "@SYSTEM_NSS@", "e" );
 ToFile( "MOZILLA_HEADERS_CFLAGS",  "@MOZILLA_HEADERS_CFLAGS@", "e" );
 ToFile( "SYSTEM_MOZILLA_HEADERS",  "@SYSTEM_MOZILLA_HEADERS@", "e" );
 ToFile( "MOZILLABUILD",  "@MOZILLABUILD@", "e" );
@@ -1427,7 +1426,6 @@ ToFile( "ENABLE_SCRIPTING_BEANSHELL","@ENABLE_SCRIPTING_BEANSHELL@","e" );
 ToFile( "ENABLE_SCRIPTING_JAVASCRIPT","@ENABLE_SCRIPTING_JAVASCRIPT@","e" );
 ToFile( "ENABLE_SCRIPTING_PYTHON","@ENABLE_SCRIPTING_PYTHON@","e" );
 ToFile( "ENABLE_QUICKSTART_LIBPNG", "@ENABLE_QUICKSTART_LIBPNG@", "e" );
-ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
 ToFile( "WITH_HELPPACK_INTEGRATION",       "@WITH_HELPPACK_INTEGRATION@",      "e");
 ToFile( "WITH_EXTENSION_INTEGRATION",       "@WITH_EXTENSION_INTEGRATION@",      "e");
@@ -1444,13 +1442,10 @@ ToFile( "LIBBASE_JAR",       "@LIBBASE_JAR@",      "e" );
 ToFile( "LIBFONTS_JAR",      "@LIBFONTS_JAR@",     "e" );
 ToFile( "LIBSERIALIZER_JAR", "@LIBSERIALIZER_JAR@","e" );
 ToFile( "ENABLE_MEDIAWIKI",  "@ENABLE_MEDIAWIKI@", "e" );
-ToFile( "SYSTEM_APACHE_COMMONS","@SYSTEM_APACHE_COMMONS@","e" );
 ToFile( "COMMONS_CODEC_JAR", "@COMMONS_CODEC_JAR@","e" );
 ToFile( "COMMONS_LANG_JAR",  "@COMMONS_LANG_JAR@", "e" );
 ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
 ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
-ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
-ToFile( "SYSTEM_SAMPLEICC", "@SYSTEM_SAMPLEICC@", "e" );
 ToFile( "SAMPLEICC_CFLAGS", "@SAMPLEICC_CFLAGS@", "e" );
 ToFile( "SAMPLEICC_LIBS", "@SAMPLEICC_LIBS@", "e" );
 ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
@@ -1727,12 +1722,10 @@ ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",   "e");
 ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
 ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
 ToFile( "ENABLE_GRAPHITE",   "@ENABLE_GRAPHITE@",   "e");
-ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GRAPHITE@",   "e");
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
 ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
 ToFile( "CL_X64",            "@CL_X64@",            "e");
 ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
-ToFile( "SYSTEM_DICTS",      "@SYSTEM_DICTS@",     "e");
 ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
 ToFile( "HYPH_SYSTEM_DIR",   "@HYPH_SYSTEM_DIR@",  "e");
 ToFile( "THES_SYSTEM_DIR",   "@THES_SYSTEM_DIR@",  "e");
@@ -1792,9 +1785,6 @@ ToFile( "EPM_FLAGS",         $EPM_FLAGS,           "e" );
 ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
 ToFile( "GPERF",             "@GPERF@",            "e" );
 ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
-ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
-ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
-ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
 ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
 ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
 ToFile( "DISABLE_PYTHON",    "@DISABLE_PYTHON@",   "e" );
@@ -1802,23 +1792,16 @@ ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
 ToFile( "PYTHON",            "@PYTHON@",           "e" );
 ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
 ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
-ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
 ToFile( "ICU_MAJOR",         "@ICU_MAJOR@",        "e" );
 ToFile( "ICU_MINOR",         "@ICU_MINOR@",        "e" );
 ToFile( "ICU_MICRO",         "@ICU_MICRO@",        "e" );
 ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" );
-ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
-ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
-ToFile( "SYSTEM_GENCMN",     "@SYSTEM_GENCMN@",    "e" );
-ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
 ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
 ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
-ToFile( "SYSTEM_POPPLER",    "@SYSTEM_POPPLER@",   "e" );
 ToFile( "POPPLER_CFLAGS",    "@POPPLER_CFLAGS@",   "e" );
 ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
 ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
 ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
-ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
 ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
 ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
 ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
@@ -1826,40 +1809,29 @@ ToFile( "XRANDR_LIBS",       "@XRANDR_LIBS@",      "e" );
 ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
 ToFile( "LIBPNG_CFLAGS",     "@LIBPNG_CFLAGS@",    "e" );
 ToFile( "LIBPNG_LIBS",       "@LIBPNG_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
 ToFile( "WPD_CFLAGS",        "@WPD_CFLAGS@",    "e" );
 ToFile( "WPD_LIBS",          "@WPD_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBWPS",     "@SYSTEM_LIBWPS@",    "e" );
 ToFile( "WPS_CFLAGS",        "@WPS_CFLAGS@",    "e" );
 ToFile( "WPS_LIBS",          "@WPS_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBWPG",     "@SYSTEM_LIBWPG@",    "e" );
 ToFile( "WPG_CFLAGS",        "@WPG_CFLAGS@",    "e" );
 ToFile( "WPG_LIBS",          "@WPG_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBVISIO",   "@SYSTEM_LIBVISIO@",  "e" );
 ToFile( "VISIO_CFLAGS",      "@VISIO_CFLAGS@",  "e" );
 ToFile( "VISIO_LIBS",        "@VISIO_LIBS@",    "e" );
-ToFile( "SYSTEM_LIBCDR",     "@SYSTEM_LIBCDR@",  "e" );
 ToFile( "CDR_CFLAGS",        "@CDR_CFLAGS@",  "e" );
 ToFile( "CDR_LIBS",          "@CDR_LIBS@",    "e" );
-ToFile( "SYSTEM_LIBCMIS",    "@SYSTEM_LIBCMIS@",  "e" );
 ToFile( "LIBCMIS_CFLAGS",    "@LIBCMIS_CFLAGS@",  "e" );
 ToFile( "LIBCMIS_LIBS",      "@LIBCMIS_LIBS@",    "e" );
-ToFile( "SYSTEM_CPPUNIT",    "@SYSTEM_CPPUNIT@",   "e" );
 ToFile( "CPPUNIT_CFLAGS",    "@CPPUNIT_CFLAGS@",   "e" );
 ToFile( "CPPUNIT_LIBS",      "@CPPUNIT_LIBS@",     "e" );
-ToFile( "SYSTEM_LIBXML",     "@SYSTEM_LIBXML@",    "e" );
 ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
 ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
-ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
 ToFile( "WITH_EXTRA_GALLERY","@WITH_EXTRA_GALLERY@",      "e" );
 ToFile( "WITH_EXTRA_TEMPLATE","@WITH_EXTRA_TEMPLATE@",      "e" );
 ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@",      "e" );
 ToFile( "WITH_EXTRA_FONT",   "@WITH_EXTRA_FONT@",      "e" );
 ToFile( "ENABLE_OXYGENOFFICE","@ENABLE_OXYGENOFFICE@","e" );
 ToFile( "OXYGENOFFICE_PACK","@OXYGENOFFICE_PACK@","e" );
-ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
-ToFile( "SYSTEM_DB_CFLAGS",  "@SYSTEM_DB_CFLAGS@", "e" );
 ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
@@ -1867,46 +1839,23 @@ ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
 ToFile( "DBUSMENUGTK_CFLAGS",  "@DBUSMENUGTK_CFLAGS@", "e" );
 ToFile( "DBUSMENUGTK_LIBS",  "@DBUSMENUGTK_LIBS@", "e" );
 ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
-ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
-ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
 ToFile( "MYSQL_LIB",         "@MYSQL_LIB@",        "e" );
 ToFile( "MYSQL_DEFINES",     "@MYSQL_DEFINES@",    "e" );
 ToFile( "LIBMYSQL_PATH",     "@LIBMYSQL_PATH@",    "e" );
-ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
 ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
-ToFile( "SYSTEM_LUCENE",     "@SYSTEM_LUCENE@",    "e" );
 ToFile( "LUCENE_CORE_JAR",   "@LUCENE_CORE_JAR@",  "e" );
 ToFile( "LUCENE_ANALYZERS_JAR",   "@LUCENE_ANALYZERS_JAR@",  "e" );
-ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
 ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
-ToFile( "SYSTEM_SAXON",      "@SYSTEM_SAXON@",     "e" );
 ToFile( "SAXON_JAR",         "@SAXON_JAR@",        "e" );
-ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );
 ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
 ToFile( "XSLTPROC",          "@XSLTPROC@",         "e" );
-ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
-ToFile( "SYSTEM_MESA_HEADERS","@SYSTEM_MESA_HEADERS@","e" );
-ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
 ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
 ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );
-ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
 ToFile( "MDDS_CPPFLAGS",     "@MDDS_CPPFLAGS@",     "e" );
-ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
-ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
-ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
 ToFile( "ENABLE_LIBRSVG",    "@ENABLE_LIBRSVG@",   "e" );
-ToFile( "SYSTEM_LIBRSVG",    "@SYSTEM_LIBRSVG@",   "e" );
-ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
-ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
-ToFile( "SYSTEM_GETTEXT",    "@SYSTEM_GETTEXT@",   "e" );
-ToFile( "SYSTEM_LIBCROCO",   "@SYSTEM_LIBCROCO@",   "e" );
-ToFile( "SYSTEM_PANGO",      "@SYSTEM_PANGO@",   "e" );
-ToFile( "SYSTEM_LIBGSF",     "@SYSTEM_LIBGSF@",   "e" );
-ToFile( "SYSTEM_LIBPNG",     "@SYSTEM_LIBPNG@",   "e" );
-ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
 ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
 ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
@@ -1916,30 +1865,21 @@ ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
-ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
 ToFile( "REDLAND_CFLAGS",    "@REDLAND_CFLAGS@",   "e" );
 ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
 ToFile( "WITH_KRB5",         "@WITH_KRB5@",        "e" );
 ToFile( "WITH_GSSAPI",       "@WITH_GSSAPI@",      "e" );
 ToFile( "BUILD_POSTGRESQL_SDBC",   "@BUILD_POSTGRESQL_SDBC@", "e" );
-ToFile( "SYSTEM_POSTGRESQL", "@SYSTEM_POSTGRESQL@", "e" );
 ToFile( "POSTGRESQL_INC",    "@POSTGRESQL_INC@",   "e" );
 ToFile( "POSTGRESQL_LIB",    "@POSTGRESQL_LIB@",   "e" );
-ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
 ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
 ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
-ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
 ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",      "e" );
 ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@",   "e" );
 ToFile( "HAVE_POSIX_FALLOCATE",    "@HAVE_POSIX_FALLOCATE@",   "e" );
-ToFile( "SYSTEM_LIBC",       "@SYSTEM_LIBC@",      "e" );
-ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
 ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
-ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
 ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
 ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBEXTTEXTCAT", "@SYSTEM_LIBEXTTEXTCAT@", "e" );
-ToFile( "SYSTEM_LIBEXTTEXTCAT_DATA","@SYSTEM_LIBEXTTEXTCAT_DATA@","e" );
 ToFile( "LIBEXTTEXTCAT_CFLAGS", "@LIBEXTTEXTCAT_CFLAGS@", "e" );
 ToFile( "LIBEXTTEXTCAT_LIBS", "@LIBEXTTEXTCAT_LIBS@", "e" );
 ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );