From 3fac774d6b3eff96e20a56ed46e9b7b3c4831f9c Mon Sep 17 00:00:00 2001
From: Tino Didriksen <mail@tinodidriksen.com>
Date: Tue, 3 Dec 2019 09:08:57 +0000
Subject: [PATCH] Cleanup, authors

---
 AUTHORS      | 11 +++++++----
 Makefile.am  | 12 ++++++------
 configure.ac | 28 ++++------------------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5a012e8f..f20f24a2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,7 @@
-Copyright (C) 2008--2016 Francis Tyers <ftyers@prompsit.com>
-Copyright (C) 2009--2017 Kevin Brubeck Unhammer <unhammer@fsfe.org>
-Copyright (C) 2008--2017 Trond Trosterud <trond.trosterud@hum.uit.no>
-Copyright (C) 2016--2017 Lene Antonsen <lene.antonsen@uit.no>
+2009-2019, Kevin Brubeck Unhammer <unhammer@fsfe.org>
+2019, Anja Zawadzka Persvold <anja.zawadzka.persvold@ntb.no>
+2014-2019, Lene Antonsen <lene.antonsen@uit.no>
+2008-2019, Trond Trosterud <trond.trosterud@uit.no>
+2008-2017, Francis M. Tyers <ftyers@prompsit.com>
+2017, Marina Kustova <marinakoustova@gmail.com>
+2016, Kartik Mistry <kartik.mistry@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index c0429031..0cb24c3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,14 +38,14 @@ $(LANG1).automorf.att.gz: $(LANG1).automorf.bin
 ## Disambiguation rules
 ###############################################################################
 
-$(LANG1).rlx.bin: $(BASENAME).$(LANG1).rlx $(CGCOMP)
-	$(CGCOMP) $< $@
+$(LANG1).rlx.bin: $(BASENAME).$(LANG1).rlx
+	cg-comp $< $@
 
-$(LANG1).seg.rlx.bin: $(BASENAME).$(LANG1).seg.rlx $(CGCOMP)
-	$(CGCOMP) $< $@
+$(LANG1).seg.rlx.bin: $(BASENAME).$(LANG1).seg.rlx
+	cg-comp $< $@
 
-$(LANG1).syn.rlx.bin: $(BASENAME).$(LANG1).syn.rlx $(CGCOMP)
-	$(CGCOMP) $< $@
+$(LANG1).syn.rlx.bin: $(BASENAME).$(LANG1).syn.rlx
+	cg-comp $< $@
 
 ###############################################################################
 ## Distribution
diff --git a/configure.ac b/configure.ac
index 422d0506..2dca1263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,12 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-
 AC_PREREQ(2.52)
 
-m4_define([required_apertium_version], [3.4.0])
-m4_define([required_lttoolbox_version], [3.3.2])
-
-AC_INIT([Apertium Norwegian Bokmål], [1.1.0], [unhammer+apertium@mm.st], [apertium-nob], [http://wiki.apertium.org/wiki/Apertium-nob])
+AC_INIT([Apertium Norwegian Bokmål], [1.1.0], [apertium-stuff@lists.sourceforge.net], [apertium-nob], [http://wiki.apertium.org/wiki/Apertium-nob])
 AM_INIT_AUTOMAKE
-
-AC_PROG_LN_S
 AC_PROG_AWK
 
-PKG_CHECK_MODULES(APERTIUM,   apertium >= required_apertium_version)
-PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= required_lttoolbox_version)
-
-AC_PATH_PROG([LTPRINT], [lt-print], [false], [$PATH$PATH_SEPARATOR$with_lt_print/bin])
-AS_IF([test x$LTPRINT = xfalse], [AC_MSG_ERROR([You don't have lt-print installed])])
-
-AC_PATH_PROG([CGCOMP], [cg-comp], [false], [$PATH$PATH_SEPARATOR$with_cg_comp/bin])
-AS_IF([test x$CGCOMP = xfalse], [AC_MSG_ERROR([You don't have cg-comp installed])])
-
-AC_PATH_PROG([CGPROC], [cg-proc], [false], [$PATH$PATH_SEPARATOR$with_cg_proc/bin])
-AS_IF([test x$CGPROC = xfalse], [AC_MSG_ERROR([You don't have cg-proc installed])])
-
-AC_PATH_PROG([PKGCONFIG], [pkg-config], [false], [$PATH$PATH_SEPARATOR$with_pkg_config/bin])
-AS_IF([test x$PKGCONFIG = xfalse], [AC_MSG_ERROR([You don't have pkg-config installed])])
+PKG_CHECK_MODULES(APERTIUM, apertium >= 3.6.0)
+PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= 3.5.0)
+PKG_CHECK_MODULES(CG3, cg3 >= 1.3.0)
 
 AP_MKINCLUDE