* pimp up gcc version display a bit, + add it to the startup logs. we now use __VERS...

 * --version detection is now done earlier, so it will work in more cases. bad configuration will not prevent --version output now

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@295 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/configure.in b/configure.in
index 85f0cc4c2b14202884e537b4cb4d84977ce01ab2..1bb45f56386d7d8255f7dab66139fb0adda464e1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl intro
 AC_INIT(pdns/receiver.cc)
-AM_INIT_AUTOMAKE(pdns, 2.9.17)
+AM_INIT_AUTOMAKE(pdns, 2.9.18-cvs)
 AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
 AC_C_BIGENDIAN 

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index 5682a88c0616fbc84664888a4faf7940f4d8e623..855e62c63ca0aa33851939ec851a60a11f02947c 100644 (file)
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -136,7 +136,7 @@ template<class Answer, class Question, class Backend>Distributor<Answer,Question
   
   d_num_threads=n;
 
-  L<<Logger::Warning<<"About to create "<<n<<" backend threads"<<endl;
+  L<<Logger::Warning<<"About to create "<<n<<" backend threads for UDP"<<endl;
 
   for(int i=0;i<n;i++) {
     pthread_create(&tid,0,&makeThread,static_cast<void *>(this));

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 9514fc9bd8adc70cfba97c227005c01a9ebafb23..8e4a43ac389eadffbb1e689ac1975a4bc5f53ee9 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -469,6 +469,15 @@ int main(int argc, char **argv)
       // never get here, guardian will reinvoke process
       cerr<<"Um, we did get here!"<<endl;
     }
+
+    if(arg().mustDo("version")) {
+      cerr<<"Version: "VERSION", compiled on "<<__DATE__", "__TIME__;
+#ifdef __GNUC__ 
+      cerr<<" with gcc version "<<__VERSION__;
+#endif
+      cout<<endl;
+      exit(99);
+    }
     
     // we really need to do work - either standalone or as an instance
     
@@ -480,14 +489,6 @@ int main(int argc, char **argv)
       exit(99);
     }
 
-    if(arg().mustDo("version")) {
-      cerr<<"Version: "VERSION", compiled on "<<__DATE__", "__TIME__;
-#ifdef __GNUC__ 
-      cerr<<" with gcc version "<<__GNUC__<<"."<<__GNUC_MINOR__<<"."<<__GNUC_PATCHLEVEL__;
-#endif
-      cout<<endl;
-      exit(99);
-    }
 
     
     if(arg().mustDo("help")) {
@@ -571,7 +572,11 @@ int main(int argc, char **argv)
   declareStats();
   DLOG(L<<Logger::Warning<<"Verbose logging in effect"<<endl);
   
-  L<<Logger::Warning<<"PowerDNS "<<VERSION<<" (C) 2001-2005 PowerDNS.COM BV ("<<__DATE__", "__TIME__<<") starting up"<<endl;
+  L<<Logger::Warning<<"PowerDNS "<<VERSION<<" (C) 2001-2005 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
+#ifdef __GNUC__
+  L<<", gcc "__VERSION__;
+#endif // add other compilers here
+  L<<") starting up"<<endl;
 
   L<<Logger::Warning<<"PowerDNS comes with ABSOLUTELY NO WARRANTY. "
     "This is free software, and you are welcome to redistribute it "