diff --git a/config/darwin-config.py b/config/darwin-config.py
index 5450897b431..54eea3630fa 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -51,7 +51,8 @@ BF_ZLIB = '/usr'
 BF_ZLIB_INC = BF_ZLIB + '/include'
 BF_ZLIB_LIB = 'z'
 
-WITH_BF_GETTEXT = 'true'
+WITH_BF_INTERNATIONAL = 'true'
+
 BF_GETTEXT = LCGDIR + '/gettext'
 BF_GETTEXT_INC = BF_GETTEXT + '/include'
 BF_GETTEXT_LIB = 'intl'
@@ -97,7 +98,6 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = LCGDIR + '/freetype'
 BF_FREETYPE_INC = BF_FREETYPE + '/include ' + BF_FREETYPE + '/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 0cd7113ad7f..415fcb9b274 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -43,7 +43,8 @@ BF_ZLIB = '/usr'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'z'
 
-WITH_BF_GETTEXT = 'true'
+WITH_BF_INTERNATIONAL = 'true'
+
 BF_GETTEXT = '/usr'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gettextlib'
@@ -88,7 +89,6 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = '/usr'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index a17a9d0ab2c..4c7ae813e3c 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -43,7 +43,8 @@ BF_ZLIB = '/usr'
 BF_ZLIB_INC = BF_ZLIB + '/include'
 BF_ZLIB_LIB = 'z'
 
-WITH_BF_GETTEXT = 'true'
+WITH_BF_INTERNATIONAL = 'true'
+
 BF_GETTEXT = '/usr'
 BF_GETTEXT_INC = BF_GETTEXT + '/include'
 BF_GETTEXT_LIB = BF_GETTEXT + '/lib/libintl.a'
@@ -86,7 +87,6 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = '/usr'
 BF_FREETYPE_INC = BF_FREETYPE + '/include ' + BF_FREETYPE + '/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index db81d418ec3..11c4578cf3d 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -51,7 +51,8 @@ BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'z'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
-WITH_BF_GETTEXT = 'true'
+WITH_BF_INTERNATIONAL = 'true'
+
 BF_GETTEXT = LCGDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'freegettext'
@@ -96,7 +97,6 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = '#../extra/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include '
 BF_FREETYPE_LIB = 'freetype'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index b07cfcfa5ae..320fbc35d27 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -57,7 +57,8 @@ BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
-WITH_BF_GETTEXT = 'true'
+WITH_BF_INTERNATIONAL = 'true'
+
 BF_GETTEXT = LCGDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
@@ -102,7 +103,6 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = LCGDIR + '/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype2ST'