Remove redefine of DATADIR that leaked in from v4.7.x

[xboard.git] / gtk / xboard.c

diff --git a/gtk/xboard.c b/gtk/xboard.c
index d59adf1..334f92a 100644 (file)
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -175,13 +175,13 @@ extern char *getenv();
    // redefine some defaults
 #  undef ICS_LOGON
 #  undef SYSCONFDIR
+#  undef DATADIR
 #  define ICS_LOGON "Library/Preferences/XboardICS.conf"
 #  define SYSCONFDIR "../etc"
 #  define DATADIR dataDir
    char *dataDir; // for expanding ~~
 #else
 #  define SLASH '/'
-#  define DATADIR "~~"
 #endif
 
 #ifdef __EMX__
@@ -679,6 +679,7 @@ PrintArg (ArgType t)
     case ArgTwo:
     case ArgNone:
     case ArgCommSettings:
+    default:
       break;
   }
   return p;
@@ -761,7 +762,7 @@ main (int argc, char **argv)
     debugFP = stderr;
 
     if(argc > 1 && (!strcmp(argv[1], "-v" ) || !strcmp(argv[1], "--version" ))) {
-       printf("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+        printf("%s version %s\n\n  configure options: %s\n", PACKAGE_NAME, PACKAGE_VERSION, CONFIGURE_OPTIONS);
        exit(0);
     }