add Xft-build-support and Xinerama-build-support to the -help output

add --enable-xinerama to configure

diff --git a/configure.in b/configure.in
index 962e67e376e61eecf14f11efbde3c3214ec7c0d5..c8584ee2af6c7f3d359928ed7031b7d19ce14ae0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -82,6 +82,36 @@ if test x$SHAPE = "xyes"; then
   AC_DEFINE(SHAPE,1,Enable support of the XShape extension)
 fi
 
+dnl Check for Xinerama extension support and proper library files.
+XINERAMA=""
+AC_MSG_CHECKING([whether to build support for the Xinerama extension])
+AC_ARG_ENABLE(
+  xinerama, [  --enable-xinerama       enable support of the Xinerama extension [default=no]],
+  if test x$enableval = "xyes"; then
+       AC_MSG_RESULT([yes])
+
+       AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+         AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
+         AC_TRY_LINK(
+#include <X11/Xlib.h>
+#include <X11/extensions/Xinerama.h>
+, XineramaScreenInfo foo,
+               AC_MSG_RESULT([yes])
+               XINERAMA="yes"
+               LIBS="$LIBS -lXinerama",
+               AC_MSG_RESULT([no])
+         )
+       )
+
+  else
+       AC_MSG_RESULT([no])
+  fi,
+  AC_MSG_RESULT([no])
+)
+if test x$XINERAMA = "xyes"; then
+  AC_DEFINE(XINERAMA,1,Enable support of the Xinerama extension)
+fi
+
 dnl Check for Xft extension support and proper library files.
 XFT=""
 AC_MSG_CHECKING([whether to build support for the Xft extension])

diff --git a/nls/C/main.m b/nls/C/main.m
index 79474952404dd87e8989885707a4b5c80ef671be..a4b97589b9078ec9f8e8e1c03f7fe8d08e0bb842 100644 (file)
--- a/nls/C/main.m
+++ b/nls/C/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Compile time options:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/da_DK/main.m b/nls/da_DK/main.m
index e95a8243a39f52f4e18c5ace4723ac3566ea435c..9d1391f94d8deea7df4ffa805a490fea0ce8e532 100644 (file)
--- a/nls/da_DK/main.m
+++ b/nls/da_DK/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Kompileret med:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/de_DE/main.m b/nls/de_DE/main.m
index 41cfd57238dc6c385f67b6fad5e23b135a9d4e3d..4bef6db632e6a03da6887ea13b211f2e9679e1ea 100644 (file)
--- a/nls/de_DE/main.m
+++ b/nls/de_DE/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Optionen zum Kompilationszeitpunkt:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/es_ES/main.m b/nls/es_ES/main.m
index bf9d4b613749cf945e4e6b68720cb26f24e422d0..1b8471b55b9ef84108bcc87653c34423c1fc4516 100644 (file)
--- a/nls/es_ES/main.m
+++ b/nls/es_ES/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Opciones durante la compilación:\n\
   Información extra para depuración:               %s\n\
   Forma:                                           %s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp simulación ordenada de colores en imágenes: %s\n\n

diff --git a/nls/et_EE/main.m b/nls/et_EE/main.m
index 4ca75cd67074e4c3ea336b2eb4543b0a65ba1f64..eef8588c7f3aac98c6b95e3158e3c5f39301de4f 100644 (file)
--- a/nls/et_EE/main.m
+++ b/nls/et_EE/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Kompileerimisoptsioonid:\n\
   Debuggimine\t\t\t%s\n\
   Kuju:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp määratud teravustamine:\t%s\n\n

diff --git a/nls/fr_FR/main.m b/nls/fr_FR/main.m
index f33f2f133eb36871a4d2577e726a167cc1f90079..128b7de453dfb71835f897661370f5cc8f42b5a5 100644 (file)
--- a/nls/fr_FR/main.m
+++ b/nls/fr_FR/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Options de compilation:\n\
   Debugage\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Lissage ordonné:\t%s\n\n

diff --git a/nls/hu_HU/main.m b/nls/hu_HU/main.m
index bc622345dd5f1d63dbf5c782b3c1cc810d78b926..085fc4798bd8fbf3694090f1ae76805fdde8cb39 100644 (file)
--- a/nls/hu_HU/main.m
+++ b/nls/hu_HU/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Fordításnál állítható lehetõségek:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/it_IT/main.m b/nls/it_IT/main.m
index b63b737115e831a941c1569e97cac2018f46700e..30d093221925105d769838f907489aadc8555475 100644 (file)
--- a/nls/it_IT/main.m
+++ b/nls/it_IT/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Opzioni in fase di compilazione:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/ja_JP/main.m b/nls/ja_JP/main.m
index 63532de4829605bdda99241a53520c5315e5d413..9911c32e26b67cae17bcf2599516d892d6637f31 100644 (file)
--- a/nls/ja_JP/main.m
+++ b/nls/ja_JP/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # ¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/ko_KR/main.m b/nls/ko_KR/main.m
index 65206ed2c21082191f0bb2d7aed3dbe8d3527078..4efef6894aa48a9c6ef693649880b2494fe796ef 100644 (file)
--- a/nls/ko_KR/main.m
+++ b/nls/ko_KR/main.m
@@ -20,4 +20,6 @@ $ #CompileOptions
 # Compile time options:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/nl_NL/main.m b/nls/nl_NL/main.m
index 010049d31ffc152beccabcd2e8c19af553ef5b77..f8c75e3c3afef7b8e6ef92b0c152b8e80a3358da 100644 (file)
--- a/nls/nl_NL/main.m
+++ b/nls/nl_NL/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Gecompileerd met instellingen:\n\
   Debugging:               %s\n\
   Shape:                   %s\n\
+  Xft:                     %s\n\
+  Xinerama:                %s\n\
   8bpp Ordered Dithering:  %s\n\n

diff --git a/nls/no_NO/main.m b/nls/no_NO/main.m
index f4e073fad5af5946b55b3b73b4d04f6354a24262..c4b6bf681a53aadb9faaf7581505771b22235642 100644 (file)
--- a/nls/no_NO/main.m
+++ b/nls/no_NO/main.m
@@ -20,4 +20,6 @@ $ #CompileOptions
 # Kompileret med:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/pt_BR/main.m b/nls/pt_BR/main.m
index 0946aeed20df3f142b3d2cfb13fef581c4ece53d..505493cdcb6eb7acb940576a10ec2899463b0804 100644 (file)
--- a/nls/pt_BR/main.m
+++ b/nls/pt_BR/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Opções em tempo de compilação:\n\
   Informações extras para problemas:\t\t\t%s\n\
   Forma:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Simulação ordenada de cores em imagens:\t%s\n\n

diff --git a/nls/ro_RO/main.m b/nls/ro_RO/main.m
index 9babaaeccddf891bcb43f1bc979f75c21c59d9d7..44f84c5186fbf276e160d7566dea20dc5027781d 100644 (file)
--- a/nls/ro_RO/main.m
+++ b/nls/ro_RO/main.m
@@ -20,4 +20,6 @@ $ #CompileOptions
 # Optiuni stabilite la compilare:\n\
   Depanare\t\t\t%s\n\
   Forma:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   Intretesere ordonata pentru 8bpp:\t%s\n\n

diff --git a/nls/ru_RU/main.m b/nls/ru_RU/main.m
index c3dcf324d8eb1fd14a17ed1ae641837368554704..9e2f2c2e118be76ba8270d2cfbe3b3f978615af5 100644 (file)
--- a/nls/ru_RU/main.m
+++ b/nls/ru_RU/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Compile time options:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/sl_SI/main.m b/nls/sl_SI/main.m
index c24ddb91db5670ef27a5294ba380644f9290aaf1..aff6ec17b694a894959bbe65c709ff187c877edb 100644 (file)
--- a/nls/sl_SI/main.m
+++ b/nls/sl_SI/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Izbire pri prevajanju:\n\
   Razhro¹èevanje\t\t\t%s\n\
   Oblika:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   Osembitno stresanje barv:\t%s\n\n

diff --git a/nls/sv_SE/main.m b/nls/sv_SE/main.m
index 98ba3512957a54dd3711e005cbfeda030667cecc..4f94aaf332d5921f79f5e6088801563c49b01815 100644 (file)
--- a/nls/sv_SE/main.m
+++ b/nls/sv_SE/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Kompilerad med:\n\
   Avlusning\t\t\t%s\n\
   Form:\t\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp ordnad dithering:\t%s\n\n

diff --git a/nls/tr_TR/main.m b/nls/tr_TR/main.m
index 18bef84d23a3923636a44daa3e86c3e43f3f86de..a279f2339b14a23e8af1beccc2f5ef9b5ed51e66 100644 (file)
--- a/nls/tr_TR/main.m
+++ b/nls/tr_TR/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Denetleme seçenekleri :\n\
   Bilgilendirme\t\t\t%s\n\
   Gölgeleme:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   R8b'e göre týzla:\t%s\n\n

diff --git a/nls/uk_UA/main.m b/nls/uk_UA/main.m
index 7132dd7cc97bab0ef2cf8b503a3fb54c28f2467c..931f1c5b4177d76fb9111b6aac2fd24c1367f037 100644 (file)
--- a/nls/uk_UA/main.m
+++ b/nls/uk_UA/main.m
@@ -22,4 +22,6 @@ $ #CompileOptions
   Debugging\t\t\t%s\n\
   Interlacing:\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/zh_CN/main.m b/nls/zh_CN/main.m
index 142e00429fa83c8c54686cafba0bd1337c391422..660bb840bffef281916bcff1ed68d16b91b70a90 100644 (file)
--- a/nls/zh_CN/main.m
+++ b/nls/zh_CN/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # ±àÒëÑ¡Ïî:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/nls/zh_TW/main.m b/nls/zh_TW/main.m
index 79474952404dd87e8989885707a4b5c80ef671be..a4b97589b9078ec9f8e8e1c03f7fe8d08e0bb842 100644 (file)
--- a/nls/zh_TW/main.m
+++ b/nls/zh_TW/main.m
@@ -21,4 +21,6 @@ $ #CompileOptions
 # Compile time options:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Xft:\t\t\t\t%s\n\
+  Xinerama:\t\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

diff --git a/src/main.cc b/src/main.cc
index 47debac1f1e53a21d51917753def70488a75742a..f192c0a191fe4f771e38f4cee57a52dfba9390aa 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -77,6 +77,8 @@ static void showHelp(int exitval) {
               "Compile time options:\n"
               "  Debugging:\t\t\t%s\n"
               "  Shape:\t\t\t%s\n"
+              "  Xft:\t\t\t\t%s\n"
+              "  Xinerama:\t\t\t%s\n"
               "  8bpp Ordered Dithering:\t%s\n\n"),
 #ifdef    DEBUG
          i18n(CommonSet, CommonYes, "yes"),
@@ -90,6 +92,18 @@ static void showHelp(int exitval) {
          i18n(CommonSet, CommonNo, "no"),
 #endif // SHAPE
 
+#ifdef    XFT
+         i18n(CommonSet, CommonYes, "yes"),
+#else // !XFT
+         i18n(CommonSet, CommonNo, "no"),
+#endif // XFT
+
+#ifdef    XINERAMA
+         i18n(CommonSet, CommonYes, "yes"),
+#else // !XINERAMA
+         i18n(CommonSet, CommonNo, "no"),
+#endif // XINERAMA
+
 #ifdef    ORDEREDPSEUDO
          i18n(CommonSet, CommonYes, "yes")
 #else // !ORDEREDPSEUDO