Towards 1.3.1

[idzebra-moved-to-github.git] / index / main.c

diff --git a/index/main.c b/index/main.c
index c32c419..bedca40 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,9 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- *
- * $Id: main.c,v 1.92 2002-07-11 13:03:01 heikki Exp $
- */
+/* $Id: main.c,v 1.94 2002-08-05 14:08:08 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -102,13 +119,8 @@ int main (int argc, char **argv)
             {
                 if (!zs)
                 {
-#if ZMBOL
-                    logf (LOG_LOG, "Z'mbol version %s %s",
-                          ZEBRAVER, ZEBRADATE);
-#else
                     logf (LOG_LOG, "Zebra version %s %s",
                           ZEBRAVER, ZEBRADATE);
-#endif
                     zs = zebra_start (configName ? configName : "zebra.cfg");
                     if (!zs)
                         exit (1);
@@ -196,11 +208,7 @@ int main (int argc, char **argv)
         }
         else if (ret == 'V')
         {
-#if ZMBOL
-            fprintf (stderr, "Z'mbol %s %s\n", ZEBRAVER, ZEBRADATE);
-#else
             fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
-#endif
            fprintf (stderr, " (C) 1994-2002, Index Data ApS\n");
 #ifdef WIN32
 #ifdef _DEBUG