X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=f672eb23f77b7c5305e9277cb3ea0c469b596d26;hb=db451d95bf97b8a8e995f031ac98da50606fd3a0;hp=c06543a1cd08004778d5a1fa2eed45eda8fef946;hpb=1775e867c408bbea2b7f197c0c40b26e586e9ef1;p=chaz%2Fopenbox

diff --git a/src/main.cc b/src/main.cc
index c06543a1..f672eb23 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -52,7 +52,6 @@ extern "C" {
 #include <string>
 using std::string;
 
-#include "i18n.hh"
 #include "blackbox.hh"
 
 
@@ -69,7 +68,7 @@ static void showHelp(int exitval) {
               "  -menu <string>\t\tuse alternate menu file.\n"
               "  -version\t\t\tdisplay version and exit.\n"
               "  -help\t\t\t\tdisplay this help text and exit.\n\n"),
-         __openbox_version);
+         OPENBOX_VERSION);
 
   // some people have requested that we print out compile options
   // as well
@@ -77,8 +76,8 @@ static void showHelp(int exitval) {
               "Compile time options:\n"
               "  Debugging:\t\t\t%s\n"
               "  Shape:\t\t\t%s\n"
-              "  Slit:\t\t\t\t%s\n"
-              "  Event Clobbering:\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"),
@@ -92,17 +91,17 @@ static void showHelp(int exitval) {
          i18n(CommonSet, CommonNo, "no"),
 #endif // SHAPE
 
-#ifdef    SLIT
+#ifdef    XFT
          i18n(CommonSet, CommonYes, "yes"),
-#else // !SLIT
+#else // !XFT
          i18n(CommonSet, CommonNo, "no"),
-#endif // SLIT
+#endif // XFT
 
-#ifndef   NOCLOBBER
+#ifdef    XINERAMA
          i18n(CommonSet, CommonYes, "yes"),
-#else // !NOCLOBBER
+#else // !XINERAMA
          i18n(CommonSet, CommonNo, "no"),
-#endif // NOCLOBBER
+#endif // XINERAMA
 
 #ifdef    ORDEREDPSEUDO
          i18n(CommonSet, CommonYes, "yes")
@@ -172,7 +171,7 @@ int main(int argc, char **argv) {
       printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
              "                    1997 - 2000, 2002 Brad Hughes\n\n",
-             __openbox_version);
+             OPENBOX_VERSION);
 
       ::exit(0);
     } else if (! strcmp(argv[i], "-help")) {