Use new version output format. Prepare for 4.0

git-svn-id: file:///svnroot/mailfromd/trunk@1419 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 8 insertions, 20 deletions

diff --git a/src/main.c b/src/main.c
index d5a2ff62..86d3038c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,2 +42,3 @@
 #include "mailfromd.h"
+#include <version-etc.h>
 
@@ -1301,3 +1302,2 @@ static const char *capa[] = {
 	"auth",
-	"license",
 	"logging",
@@ -1435,20 +1435,2 @@ switch_to_privs(uid_t uid, gid_t gid)
 
-static char *license =
-    "   This is mailfromd filter.\n"
-    "   Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff\n"
-    "\n"
-    "   ls is free software; you can redistribute it and/or modify\n"
-    "   it under the terms of the GNU General Public License as published by\n"
-    "   the Free Software Foundation; either version 2 of the License, or\n"
-    "   (at your option) any later version.\n"
-    "\n"
-    "   This program is distributed in the hope that it will be useful,\n"
-    "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-    "   GNU General Public License for more details.\n"
-    "\n"
-    "   You should have received a copy of the GNU General Public License along\n"
-    "   with this program; if not, write to the Free Software Foundation,\n"
-    "   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n\n";
-
 void
@@ -1720,2 +1702,8 @@ stderr_closed_p()
 
+static void
+version(FILE *stream, struct argp_state *state)
+{
+	mailfromd_version("mailfromd", stream, state);
+}
+	
 int
@@ -1725,3 +1713,2 @@ main(int argc, char **argv)
 
-	mu_license_text = license;
 	MU_AUTH_REGISTER_ALL_MODULES();
@@ -1730,2 +1717,3 @@ main(int argc, char **argv)
 		program_invocation_short_name = argv[0];
+	argp_program_version_hook = version;