From 21ceafd12f521098d8f2d91b2eec1b4d90e8f0e4 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Sat, 25 Sep 2010 00:45:20 -0700
Subject: [PATCH] AC_SUBST MOO_WEB_CONTACT

---
 configure.ac      | 50 +++++++++++++++++------------------------------
 doc/man-medit.t2t |  2 +-
 doc/medit.1       |  2 +-
 m4/moo-gtk.m4     |  6 ++----
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/configure.ac b/configure.ac
index f1955f99..53dc3f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,31 +22,25 @@ AC_SUBST(ACLOCAL_FLAGS)
 AM_INIT_AUTOMAKE([1.11 silent-rules foreign dist-bzip2 no-dist-gzip])
 # LT_INIT([disable-shared])
 
-MOO_MAJOR_VERSION=_moo_major_version_
-MOO_MINOR_VERSION=_moo_minor_version_
-MOO_MICRO_VERSION=_moo_micro_version_
-MOO_MODULE_MAJOR_VERSION=_moo_module_major_version_
-MOO_MODULE_MINOR_VERSION=_moo_module_minor_version_
-MOO_VERSION=_moo_version_
-MOO_DISPLAY_VERSION=_moo_display_version_
-MOO_EMAIL="_moo_email_"
-MOO_WEBSITE="_moo_website_"
-MOO_WEB_CONTACT="_moo_web_contact_"
-MOO_COPYRIGHT="_moo_copyright_"
-MOO_PACKAGE_NAME=moo
-AC_SUBST(MOO_EMAIL)
-AC_SUBST(MOO_WEBSITE)
-AC_SUBST(MOO_DISPLAY_VERSION)
-AC_SUBST(MOO_COPYRIGHT)
+AC_SUBST(MOO_MAJOR_VERSION,_moo_major_version_)
+AC_SUBST(MOO_MINOR_VERSION,_moo_minor_version_)
+AC_SUBST(MOO_MICRO_VERSION,_moo_micro_version_)
+AC_SUBST(MOO_MODULE_MAJOR_VERSION,_moo_module_major_version_)
+AC_SUBST(MOO_MODULE_MINOR_VERSION,_moo_module_minor_version_)
+AC_SUBST(MOO_VERSION,_moo_version_)
+AC_SUBST(MOO_DISPLAY_VERSION,"_moo_display_version_")
+AC_SUBST(MOO_EMAIL,"_moo_email_")
+AC_SUBST(MOO_WEBSITE,"_moo_website_")
+AC_SUBST(MOO_WEB_CONTACT,"_moo_web_contact_")
+AC_SUBST(MOO_COPYRIGHT,"_moo_copyright_")
 
 # keep in sync with po/maintain
-MOO_PACKAGE_NAME="medit-1"
+AC_SUBST(MOO_PACKAGE_NAME,"medit-1")
 MOO_INI_FILE_NAME="medit.ini"
 MOO_STATE_FILE_NAME="medit.state"
 MOO_SESSION_FILE_NAME="medit.session"
 
-GETTEXT_PACKAGE=$MOO_PACKAGE_NAME
-AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST(GETTEXT_PACKAGE,$MOO_PACKAGE_NAME)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[GETTEXT_PACKAGE])
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL
@@ -86,9 +80,6 @@ AC_DEFINE_UNQUOTED(MOO_DISPLAY_VERSION,["$MOO_DISPLAY_VERSION"],[MOO_DISPLAY_VER
 AC_DEFINE_UNQUOTED(MOO_MAJOR_VERSION,[$MOO_MAJOR_VERSION],[MOO_MAJOR_VERSION])
 AC_DEFINE_UNQUOTED(MOO_MICRO_VERSION,[$MOO_MICRO_VERSION],[MOO_MICRO_VERSION])
 AC_DEFINE_UNQUOTED(MOO_MINOR_VERSION,[$MOO_MINOR_VERSION],[MOO_MINOR_VERSION])
-AC_SUBST([MOO_MAJOR_VERSION])
-AC_SUBST([MOO_MICRO_VERSION])
-AC_SUBST([MOO_MINOR_VERSION])
 AC_DEFINE_UNQUOTED(MOO_MODULE_MAJOR_VERSION,[$MOO_MODULE_MAJOR_VERSION],[MOO_MODULE_MAJOR_VERSION])
 AC_DEFINE_UNQUOTED(MOO_MODULE_MINOR_VERSION,[$MOO_MODULE_MINOR_VERSION],[MOO_MODULE_MINOR_VERSION])
 
@@ -106,16 +97,11 @@ if $MOO_OS_UNIX; then
 fi
 
 if $MOO_OS_WIN32; then
-  MEDIT_WIN32_APP_UID="7F9F899F-EE8A-47F0-9981-8C525AF78E4D"
-  AC_SUBST(MEDIT_WIN32_APP_UID)
-  MEDIT_INNO_TOP_SRCDIR="Z:`cd $srcdir && pwd`"
-  MEDIT_INNO_TOP_BUILDDIR="Z:`pwd`"
-  MEDIT_INNO_INSTDIR="Z:`cd $prefix && pwd`"
-  MEDIT_INNO_COMPILER='wine "c:\\program files\\inno setup 5\\ISCC.exe"'
-  AC_SUBST(MEDIT_INNO_TOP_SRCDIR)
-  AC_SUBST(MEDIT_INNO_TOP_BUILDDIR)
-  AC_SUBST(MEDIT_INNO_INSTDIR)
-  AC_SUBST(MEDIT_INNO_COMPILER)
+  AC_SUBST(MEDIT_WIN32_APP_UID,"7F9F899F-EE8A-47F0-9981-8C525AF78E4D")
+  AC_SUBST(MEDIT_INNO_TOP_SRCDIR,"Z:`cd $srcdir && pwd`")
+  AC_SUBST(MEDIT_INNO_TOP_BUILDDIR,"Z:`pwd`")
+  AC_SUBST(MEDIT_INNO_INSTDIR,"Z:`cd $prefix && pwd`")
+  AC_SUBST(MEDIT_INNO_COMPILER,'wine "c:\\program files\\inno setup 5\\ISCC.exe"')
 fi
 
 AC_ARG_ENABLE(install-hooks,
diff --git a/doc/man-medit.t2t b/doc/man-medit.t2t
index ceacf29e..4a777f64 100644
--- a/doc/man-medit.t2t
+++ b/doc/man-medit.t2t
@@ -92,7 +92,7 @@ to open a file (e.g. for inverse DVI search).
 
 = CONTACT =
 
-@MOO_WEB_CONTACT@
+http://mooedit.sourceforge.net/contact.html
 
 
 = AUTHOR =
diff --git a/doc/medit.1 b/doc/medit.1
index 786a1099..a2e760d4 100644
--- a/doc/medit.1
+++ b/doc/medit.1
@@ -99,7 +99,7 @@ to open a file (e.g. for inverse DVI search).
 
 .SH CONTACT
 .P
-@MOO_WEB_CONTACT@
+http://mooedit.sourceforge.net/contact.html
 
 .SH AUTHOR
 .P
diff --git a/m4/moo-gtk.m4 b/m4/moo-gtk.m4
index 40f1dbe0..e2e36e29 100644
--- a/m4/moo-gtk.m4
+++ b/m4/moo-gtk.m4
@@ -87,10 +87,8 @@ AM_CONDITIONAL(GDK_X11, $GDK_X11)
 AM_CONDITIONAL(GDK_WIN32, $GDK_WIN32)
 AM_CONDITIONAL(GDK_QUARTZ, $GDK_QUARTZ)
 
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-AC_SUBST(GLIB_GENMARSHAL)
-AC_SUBST(GLIB_MKENUMS)
+AC_SUBST(GLIB_GENMARSHAL, `$PKG_CONFIG --variable=glib_genmarshal glib-2.0`)
+AC_SUBST(GLIB_MKENUMS, `$PKG_CONFIG --variable=glib_mkenums glib-2.0`)
 
 AC_ARG_VAR([GDK_PIXBUF_CSOURCE], [gdk-pixbuf-csource])
 AC_CHECK_TOOL(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, [AC_MSG_ERROR([gdk-pixbuf-csource not found])])