aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-07 23:17:24 (GMT)
committerrathnor <rathnor>2003-05-07 23:17:24 (GMT)
commit72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3 (patch)
tree49873e46a53ad9ab2a30233d3e91411a431988e8
parent1b9a07dcbc4ffa650ad824cbf0db27cb67fb3cc9 (diff)
downloadfluxbox-72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3.zip
fluxbox-72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3.tar.bz2
move compiled-in option reporting into -info
Also explicitly say which ones aren't in.
-rw-r--r--src/main.cc69
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 @@
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 }