move compiled-in option reporting into -info

Also explicitly say which ones aren't in.
author: rathnor <rathnor> 2003-05-07 23:17:24 (GMT)
committer: rathnor <rathnor> 2003-05-07 23:17:24 (GMT)
commit: 72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3 (patch)
tree: 49873e46a53ad9ab2a30233d3e91411a431988e8
parent: 1b9a07dcbc4ffa650ad824cbf0db27cb67fb3cc9 (diff)
download: fluxbox_pavel-72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3.zip
fluxbox_pavel-72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3.tar.bz2
1 files changed, 42 insertions, 27 deletions
diff --git a/src/main.cc b/src/main.cc
index 183983f..d0a17d7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: main.cc,v 1.15 2003/05/07 22:19:59 fluxgen Exp $
+// $Id: main.cc,v 1.16 2003/05/07 23:17:24 rathnor Exp $
@@ -118,46 +118,61 @@ int main(int argc, char **argv) {
                              " -display <string>\t\tuse display connection.\n"
                              " -rc <string>\t\t\tuse alternate resource file.\n"
                              " -version\t\t\tdisplay version and exit.\n"
+                              " -info\t\t\tdisplay some useful information.\n"
                              " -help\t\t\t\tdisplay this help text and exit.\n\n"),
                   __fluxbox_version);
+            ::exit(0);
-            cout<<"Compiled with: "<<endl<<
+        } else if (strcmp(argv[i], "-info") == 0 || strcmp(argv[i], "-i") == 0) {
-#ifdef DEBUG
+#define NOT "-"
-                "DEBUG"<<endl<<
+            cout<<"Compiled options ("<<NOT<<" => disabled): "<<endl<<
+#ifndef DEBUG
+                NOT<<
 #endif // DEBUG                
-#ifdef SLIT
+                "DEBUG"<<endl<<
-                "SLIT"<<endl<<
+#ifndef SLIT
+                NOT<<
 #endif // SLIT
-#ifdef HAVE_XPM
+                "SLIT"<<endl<<
-                "XPM"<<endl<<
+#ifndef HAVE_XPM
+                NOT<<
 #endif // HAVE_XPM
-#ifdef USE_GNOME
+                "XPM"<<endl<<
-                "GNOME"<<endl<<
+#ifndef USE_GNOME
+                NOT<<
 #endif // USE_GNOME 
-#ifdef KDE
+                "GNOME"<<endl<<
-                "KDE"<<endl<<
+#ifndef KDE
+                NOT<<
 #endif // KDE
-#ifdef USE_NEWWMSPEC
+                "KDE"<<endl<<
-                "EWMH"<<endl<<
+#ifndef USE_NEWWMSPEC
+                NOT<<
 #endif // USE_NEWWMSPEC
-#ifdef REMEMBER
+                "EWMH"<<endl<<
-                "REMEMBER"<<endl<<
+#ifndef REMEMBER
+                NOT<<
 #endif // REMEMBER
-#ifdef SHAPE
+                "REMEMBER"<<endl<<
-                "SHAPE"<<endl<<
+#ifndef SHAPE
+                NOT<<
 #endif // SHAPE
-#ifdef USE_XFT
+                "SHAPE"<<endl<<
-                "XFT"<<endl<<
+#ifndef USE_XFT
+                NOT<<
 #endif // USE_XFT
-#ifdef USE_XMB
+                "XFT"<<endl<<
-                "XMB"<<endl<<
+#ifndef USE_XMB
+                NOT<<
 #endif // USE_XMB
-#ifdef XINERAMA
+                "XMB"<<endl<<
-                "XINERAMA"<<endl<<
+#ifndef XINERAMA
+                NOT<<
 #endif // XINERAMA
-#ifdef HAVE_XRENDER
+                "XINERAMA"<<endl<<
-                "RENDER"<<endl<<
+#ifndef HAVE_XRENDER
+                NOT<<
 #endif // HAVE_XRENDER
+                "RENDER"<<endl<<
                endl;
            ::exit(0);
        }
author	rathnor <rathnor>	2003-05-07 23:17:24 (GMT)
committer	rathnor <rathnor>	2003-05-07 23:17:24 (GMT)
commit	72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3 (patch)
tree	49873e46a53ad9ab2a30233d3e91411a431988e8
parent	1b9a07dcbc4ffa650ad824cbf0db27cb67fb3cc9 (diff)
download	fluxbox_pavel-72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3.zip fluxbox_pavel-72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3.tar.bz2

diff --git a/src/main.cc b/src/main.cc index 183983f..d0a17d7 100644 --- a/src/main.cc +++ b/src/main.cc
@@ -22,7 +22,7 @@
22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23	// DEALINGS IN THE SOFTWARE.	23	// DEALINGS IN THE SOFTWARE.
24		24
25	// $Id: main.cc,v 1.15 2003/05/07 22:19:59 fluxgen Exp $	25	// $Id: main.cc,v 1.16 2003/05/07 23:17:24 rathnor Exp $
26		26
27		27
28		28
@@ -118,46 +118,61 @@ int main(int argc, char **argv) {
118	" -display <string>\t\tuse display connection.\n"	118	" -display <string>\t\tuse display connection.\n"
119	" -rc <string>\t\t\tuse alternate resource file.\n"	119	" -rc <string>\t\t\tuse alternate resource file.\n"
120	" -version\t\t\tdisplay version and exit.\n"	120	" -version\t\t\tdisplay version and exit.\n"
		121	" -info\t\t\tdisplay some useful information.\n"
121	" -help\t\t\t\tdisplay this help text and exit.\n\n"),	122	" -help\t\t\t\tdisplay this help text and exit.\n\n"),
122	__fluxbox_version);	123	__fluxbox_version);
123		124	::exit(0);
124	cout<<"Compiled with: "<<endl<<	125	} else if (strcmp(argv[i], "-info") == 0 \|\| strcmp(argv[i], "-i") == 0) {
125	#ifdef DEBUG	126	#define NOT "-"
126	"DEBUG"<<endl<<	127	cout<<"Compiled options ("<<NOT<<" => disabled): "<<endl<<
		128	#ifndef DEBUG
		129	NOT<<
127	#endif // DEBUG	130	#endif // DEBUG
128	#ifdef SLIT	131	"DEBUG"<<endl<<
129	"SLIT"<<endl<<	132	#ifndef SLIT
		133	NOT<<
130	#endif // SLIT	134	#endif // SLIT
131	#ifdef HAVE_XPM	135	"SLIT"<<endl<<
132	"XPM"<<endl<<	136	#ifndef HAVE_XPM
		137	NOT<<
133	#endif // HAVE_XPM	138	#endif // HAVE_XPM
134	#ifdef USE_GNOME	139	"XPM"<<endl<<
135	"GNOME"<<endl<<	140	#ifndef USE_GNOME
		141	NOT<<
136	#endif // USE_GNOME	142	#endif // USE_GNOME
137	#ifdef KDE	143	"GNOME"<<endl<<
138	"KDE"<<endl<<	144	#ifndef KDE
		145	NOT<<
139	#endif // KDE	146	#endif // KDE
140	#ifdef USE_NEWWMSPEC	147	"KDE"<<endl<<
141	"EWMH"<<endl<<	148	#ifndef USE_NEWWMSPEC
		149	NOT<<
142	#endif // USE_NEWWMSPEC	150	#endif // USE_NEWWMSPEC
143	#ifdef REMEMBER	151	"EWMH"<<endl<<
144	"REMEMBER"<<endl<<	152	#ifndef REMEMBER
		153	NOT<<
145	#endif // REMEMBER	154	#endif // REMEMBER
146	#ifdef SHAPE	155	"REMEMBER"<<endl<<
147	"SHAPE"<<endl<<	156	#ifndef SHAPE
		157	NOT<<
148	#endif // SHAPE	158	#endif // SHAPE
149	#ifdef USE_XFT	159	"SHAPE"<<endl<<
150	"XFT"<<endl<<	160	#ifndef USE_XFT
		161	NOT<<
151	#endif // USE_XFT	162	#endif // USE_XFT
152	#ifdef USE_XMB	163	"XFT"<<endl<<
153	"XMB"<<endl<<	164	#ifndef USE_XMB
		165	NOT<<
154	#endif // USE_XMB	166	#endif // USE_XMB
155	#ifdef XINERAMA	167	"XMB"<<endl<<
156	"XINERAMA"<<endl<<	168	#ifndef XINERAMA
		169	NOT<<
157	#endif // XINERAMA	170	#endif // XINERAMA
158	#ifdef HAVE_XRENDER	171	"XINERAMA"<<endl<<
159	"RENDER"<<endl<<	172	#ifndef HAVE_XRENDER
		173	NOT<<
160	#endif // HAVE_XRENDER	174	#endif // HAVE_XRENDER
		175	"RENDER"<<endl<<
161	endl;	176	endl;
162	::exit(0);	177	::exit(0);
163	}	178	}