summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-07-21 17:58:03 +0000
committerDana Jansens <danakj@orodu.net>2002-07-21 17:58:03 +0000
commit296c12c0361d64ad612d22154440ad4046938300 (patch)
tree943041a02ba62f5b936effc0d40b0a655286dfaf
parent0ee5660504b3d55b8fb989241a675af4f925087f (diff)
add Xft-build-support and Xinerama-build-support to the -help output
add --enable-xinerama to configure
-rw-r--r--configure.in30
-rw-r--r--nls/C/main.m2
-rw-r--r--nls/da_DK/main.m2
-rw-r--r--nls/de_DE/main.m2
-rw-r--r--nls/es_ES/main.m2
-rw-r--r--nls/et_EE/main.m2
-rw-r--r--nls/fr_FR/main.m2
-rw-r--r--nls/hu_HU/main.m2
-rw-r--r--nls/it_IT/main.m2
-rw-r--r--nls/ja_JP/main.m2
-rw-r--r--nls/ko_KR/main.m2
-rw-r--r--nls/nl_NL/main.m2
-rw-r--r--nls/no_NO/main.m2
-rw-r--r--nls/pt_BR/main.m2
-rw-r--r--nls/ro_RO/main.m2
-rw-r--r--nls/ru_RU/main.m2
-rw-r--r--nls/sl_SI/main.m2
-rw-r--r--nls/sv_SE/main.m2
-rw-r--r--nls/tr_TR/main.m2
-rw-r--r--nls/uk_UA/main.m2
-rw-r--r--nls/zh_CN/main.m2
-rw-r--r--nls/zh_TW/main.m2
-rw-r--r--src/main.cc14
23 files changed, 86 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 962e67e3..c8584ee2 100644
--- 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 79474952..a4b97589 100644
--- 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 e95a8243..9d1391f9 100644
--- 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 41cfd572..4bef6db6 100644
--- 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 bf9d4b61..1b8471b5 100644
--- 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 4ca75cd6..eef8588c 100644
--- 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 f33f2f13..128b7de4 100644
--- 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 bc622345..085fc479 100644
--- 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 b63b7371..30d09322 100644
--- 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 63532de4..9911c32e 100644
--- 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 65206ed2..4efef689 100644
--- 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 010049d3..f8c75e3c 100644
--- 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 f4e073fa..c4b6bf68 100644
--- 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 0946aeed..505493cd 100644
--- 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 9babaaec..44f84c51 100644
--- 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 c3dcf324..9e2f2c2e 100644
--- 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 c24ddb91..aff6ec17 100644
--- 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 98ba3512..4f94aaf3 100644
--- 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 18bef84d..a279f233 100644
--- 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 7132dd7c..931f1c5b 100644
--- 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 142e0042..660bb840 100644
--- 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 79474952..a4b97589 100644
--- 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 47debac1..f192c0a1 100644
--- 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