2003-08-12 Paul Jakma <paul@dishone.st>

2003-08-12 Paul Jakma <paul@dishone.st>

        * Makefile.am: redhat/zebra.* -> redhat/quagga.*
        * configure.ac: Bump autoconf prerequisite to 2.53.
          dist name zebra -> quagga.
          general Zebra -> Quagga where appropriate (ie not zebra daemon).
          User and group zebra->quagga.
          s/ZEBRA\(_VERSION\)/QUAGGA\1/.
        * bgpd/bgp_main.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * lib/command.c: Update banners and s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * lib/print_version.c: ditto
        * lib/version.h: s/ZEBRA\(_VERSION\)/QUAGGA\1/ and bump version.
          Change ZEBRA_URL.
        * lib/smux.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * lib/vty.h: Change Zebra.conf to Quagga.conf (integrated file)
        * ospf6d/ospf6{,_main}.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * ospfd/ospf_main.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/

5 files changed, 7 insertions, 7 deletions

diff --git a/lib/command.c b/lib/command.c
index f207fc669..71db3aa16 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -39,7 +39,7 @@ struct host host;
 /* Default motd string. */
 char *default_motd = 
 "\r\n\
-Hello, this is zebra (version " ZEBRA_VERSION ").\r\n\
+Hello, this is quagga (version " QUAGGA_VERSION ").\r\n\
 Copyright 1996-2002 Kunihiro Ishiguro.\r\n\
 \r\n";
 
@@ -2393,7 +2393,7 @@ DEFUN (show_version,
        SHOW_STR
        "Displays zebra version\n")
 {
-  vty_out (vty, "Zebra %s (%s).%s", ZEBRA_VERSION,
+  vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION,
 	   host_name,
 	   VTY_NEWLINE);
   vty_out (vty, "Copyright 1996-2002, Kunihiro Ishiguro.%s", VTY_NEWLINE);
diff --git a/lib/print_version.c b/lib/print_version.c
index 6b4064d3d..4c9be0470 100644
--- a/lib/print_version.c
+++ b/lib/print_version.c
@@ -26,6 +26,6 @@
 void
 print_version (char *progname)
 {
-  printf ("%s version %s (%s)\n", progname, ZEBRA_VERSION, host_name);
+  printf ("%s version %s (%s)\n", progname, QUAGGA_VERSION, host_name);
   printf ("Copyright 1996-2001, Kunihiro Ishiguro\n");
 }
diff --git a/lib/smux.c b/lib/smux.c
index c6884d1b7..e9631cb31 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -952,7 +952,7 @@ smux_open (int sock)
   u_char *ptr;
   int len;
   u_long version;
-  u_char progname[] = "zebra-" ZEBRA_VERSION;
+  u_char progname[] = "zebra-" QUAGGA_VERSION;
 
   if (debug_smux)
     {
diff --git a/lib/version.h b/lib/version.h
index 028e1f8ed..84df21c63 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -22,11 +22,11 @@
 #ifndef _ZEBRA_VERSION_H
 #define _ZEBRA_VERSION_H
 
-#define ZEBRA_VERSION     "0.94"
+#define QUAGGA_VERSION     "0.96"
 
 #define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org"
 
-#define ZEBRA_URL "http://zebra.dishone.st"
+#define ZEBRA_URL "http://www.quagga.net"
 
 extern char *host_name;
 
diff --git a/lib/vty.h b/lib/vty.h
index aaf8a5b12..fedfb3ed4 100644
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -131,7 +131,7 @@ struct vty
 };
 
 /* Integrated configuration file. */
-#define INTEGRATE_DEFAULT_CONFIG "Zebra.conf"
+#define INTEGRATE_DEFAULT_CONFIG "Quagga.conf"
 
 /* Small macro to determine newline is newline only or linefeed needed. */
 #define VTY_NEWLINE  ((vty->type == VTY_TERM) ? "\r\n" : "\n")