From df47dd31f16cb1823dcb6715d4fad4ba556083a4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 13 Feb 2012 15:49:55 +0900
Subject: [PATCH] Clean up the excessive makefile vars generated by AC_SUBST.

While it further breaks RPM building, all AC_SUBST(HAVE_*) have been nuked.
When AM_SUBST_NOTMAKE, tell automake to not generate var = @var@ in
Makefile.in for qf specific vars (QF_SUBST is a wrapper for AC_SUBST that
also calls AM_SUBST_NOTMAKE).
---
 config.d/build_control.m4 | 34 +++++++++++++++++-----------------
 config.d/cdrom.m4         |  5 +----
 config.d/compiling.m4     |  4 ++--
 config.d/fbdev.m4         |  1 -
 config.d/mgl.m4           |  1 -
 config.d/paths.m4         |  6 +-----
 config.d/sdl.m4           |  3 ---
 config.d/sound.m4         |  2 --
 config.d/svga.m4          |  1 -
 config.d/versions.m4      |  7 +------
 config.d/x11.m4           |  1 -
 m4/quakeforge.m4          | 19 ++++++++++---------
 12 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index e559c2f22..fe7d5c245 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -370,9 +370,9 @@ if test "x$enable_static" = xno; then
 else
 	STATIC=-static
 fi
-AC_SUBST(PREFER_PIC)
-AC_SUBST(PREFER_NON_PIC)
-AC_SUBST(STATIC)
+QF_SUBST(PREFER_PIC)
+QF_SUBST(PREFER_NON_PIC)
+QF_SUBST(STATIC)
 
 AC_ARG_WITH(static-plugins,
 [  --with-static-plugins   build plugins into executable rather than separate],
@@ -407,20 +407,20 @@ fi
 dnl Do not use -module here, it belongs in makefile.am due to automake
 dnl needing it there to work correctly
 
-AC_SUBST(HW_TARGETS)
-AC_SUBST(NQ_TARGETS)
-AC_SUBST(NQ_DESKTOP_DATA)
-AC_SUBST(QTV_TARGETS)
-AC_SUBST(QW_TARGETS)
-AC_SUBST(QW_DESKTOP_DATA)
-AC_SUBST(CD_TARGETS)
-AC_SUBST(JOY_TARGETS)
-AC_SUBST(SND_TARGETS)
-AC_SUBST(AUDIO_TARGETS)
-AC_SUBST(VID_MODEL_TARGETS)
-AC_SUBST(VID_REND_TARGETS)
-AC_SUBST(VID_REND_NOINST_TARGETS)
-AC_SUBST(VID_TARGETS)
+QF_SUBST(HW_TARGETS)
+QF_SUBST(NQ_TARGETS)
+QF_SUBST(NQ_DESKTOP_DATA)
+QF_SUBST(QTV_TARGETS)
+QF_SUBST(QW_TARGETS)
+QF_SUBST(QW_DESKTOP_DATA)
+QF_SUBST(CD_TARGETS)
+QF_SUBST(JOY_TARGETS)
+QF_SUBST(SND_TARGETS)
+QF_SUBST(AUDIO_TARGETS)
+QF_SUBST(VID_MODEL_TARGETS)
+QF_SUBST(VID_REND_TARGETS)
+QF_SUBST(VID_REND_NOINST_TARGETS)
+QF_SUBST(VID_TARGETS)
 
 QF_DEPS(BSP2IMG,
 	[],
diff --git a/config.d/cdrom.m4 b/config.d/cdrom.m4
index 93a398515..38e407669 100644
--- a/config.d/cdrom.m4
+++ b/config.d/cdrom.m4
@@ -7,10 +7,7 @@ AC_ARG_ENABLE(xmms,
 [  --enable-xmms           enable checking for XMMS],
 )
 if test "x$mingw" != xyes -a "x$enable_xmms" == xyes; then
-	AM_PATH_XMMS(0.9.5.1,
-		HAVE_XMMS=yes,
-		HAVE_XMMS=no)
-	AC_SUBST(HAVE_XMMS)
+	AM_PATH_XMMS(0.9.5.1, HAVE_XMMS=yes, HAVE_XMMS=no)
 fi
 
 CDTYPE=""
diff --git a/config.d/compiling.m4 b/config.d/compiling.m4
index b0464a254..0cb6d9115 100644
--- a/config.d/compiling.m4
+++ b/config.d/compiling.m4
@@ -253,8 +253,8 @@ AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 AC_SUBST(CCAS)
 AC_SUBST(CCASFLAGS)
-AC_SUBST(plugin_ldflags)
-AC_SUBST(plugin_libadd)
+QF_SUBST(plugin_ldflags)
+QF_SUBST(plugin_libadd)
 
 dnl Finalization of CFLAGS, LDFLAGS, and LIBS
 AC_SUBST(CFLAGS)
diff --git a/config.d/fbdev.m4 b/config.d/fbdev.m4
index b1e238a4a..bcf003be7 100644
--- a/config.d/fbdev.m4
+++ b/config.d/fbdev.m4
@@ -8,7 +8,6 @@ if test "x$HAVE_FBDEV" != xno; then
 	AC_CHECK_HEADERS(linux/fb.h, HAVE_FBDEV=yes, HAVE_FBDEV=no)
 fi
 
-AC_SUBST(HAVE_FBDEV)
 if test "x$HAVE_FBDEV" = xyes; then
 	AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_VGA4)
 	AC_TRY_COMPILE(
diff --git a/config.d/mgl.m4 b/config.d/mgl.m4
index 81768b4bd..f6950c679 100644
--- a/config.d/mgl.m4
+++ b/config.d/mgl.m4
@@ -33,6 +33,5 @@ if test "x$HAVE_MGL" != xno; then
 		MGL_CFLAGS="" MGL_LIBS=""
 	fi
 fi
-AC_SUBST(HAVE_MGL)
 AC_SUBST(MGL_CFLAGS)
 AC_SUBST(MGL_LIBS)
diff --git a/config.d/paths.m4 b/config.d/paths.m4
index a2d43390c..29021114e 100644
--- a/config.d/paths.m4
+++ b/config.d/paths.m4
@@ -45,7 +45,6 @@ if test "x$globalconf" = "xauto" || test "x$globalconf" = "xyes" || \
 	globalconf="$default_globalconf"
 fi
 AC_DEFINE_UNQUOTED(FS_GLOBALCFG, "$globalconf", [Define this to the location of the global config file])
-AC_SUBST(globalconf)
 
 AC_ARG_WITH(user-cfg,
 [  --with-user-cfg=FILE    If set will change the name and location of the
@@ -57,7 +56,6 @@ if test "x$userconf" = "xauto" || test "x$userconf" = "xyes" || \
 	userconf="$default_userconf"
 fi
 AC_DEFINE_UNQUOTED(FS_USERCFG, "$userconf", [Define this to the location of the user config file])
-AC_SUBST(userconf)
 
 AC_ARG_WITH(sharepath,
 [  --with-sharepath=DIR    Use DIR for shared game data, defaults to
@@ -69,7 +67,7 @@ elif test "x$sharepath" = xno; then
 	sharepath="."
 fi
 AC_DEFINE_UNQUOTED(FS_SHAREPATH, "$sharepath", [Define this to the shared game directory root])
-AC_SUBST(sharepath)
+QF_SUBST(sharepath)
 
 AC_ARG_WITH(userpath,
 [  --with-userpath=DIR     Use DIR for unshared game data, defaults to
@@ -81,7 +79,6 @@ elif test "x$userpath" = xno; then
 	userpath="."
 fi
 AC_DEFINE_UNQUOTED(FS_USERPATH, "$userpath", [Define this to the unshared game directory root])
-AC_SUBST(userpath)
 
 AC_ARG_WITH(plugin-path,
 [  --with-plugin-path=DIR  Use DIR for loading plugins, defaults to
@@ -100,7 +97,6 @@ eval expanded_plugindir="$plugindir"
 eval expanded_plugindir="$expanded_plugindir"
 AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$expanded_plugindir", [Define this to the path from which to load plugins])
 AC_SUBST(plugindir)
-AC_SUBST(PLUGINDIR)
 
 AC_ARG_WITH(gl-driver,
 	[  --with-gl-driver=NAME   Name of OpenGL driver DLL/DSO],
diff --git a/config.d/sdl.m4 b/config.d/sdl.m4
index 377f96831..09e752eb4 100644
--- a/config.d/sdl.m4
+++ b/config.d/sdl.m4
@@ -7,7 +7,6 @@ if test "x$enable_sdl" != xno; then
 	AM_PATH_SDL(1.2.0,
 		HAVE_SDL=yes,
 		HAVE_SDL=no)
-	AC_SUBST(HAVE_SDL)
 	if test "x$HAVE_SDL" = "xyes"; then
 		case "$host_os" in
 			mingw*)
@@ -29,7 +28,6 @@ AC_ARG_ENABLE(sdl-audio,
 if test "x$enable_sdl_audio" != xno; then
 	if test "x$HAVE_SDL" = "xyes"; then
 		HAVE_SDL_AUDIO=yes
-		AC_SUBST(HAVE_SDL_AUDIO)
 	fi
 fi
 
@@ -40,6 +38,5 @@ AC_ARG_ENABLE(sdl-cd,
 if test "x$enable_sdl_cd" != xno; then
 	if test "x$HAVE_SDL" = "xyes"; then
 		HAVE_SDL_CD=yes
-		AC_SUBST(HAVE_SDL_CD)
 	fi
 fi
diff --git a/config.d/sound.m4 b/config.d/sound.m4
index 8dca28aa8..c0fd6afce 100644
--- a/config.d/sound.m4
+++ b/config.d/sound.m4
@@ -94,7 +94,6 @@ QF_maGiC_VALUE
 		fi
 	fi
 	AC_SUBST(ALSA_LIBS)
-	AC_SUBST(HAVE_ALSA)
 
 	AC_ARG_ENABLE(jack,
 	[  --disable-jack          disable jack support],
@@ -196,7 +195,6 @@ QF_maGiC_VALUE
 		)
 		fi
 	fi
-	AC_SUBST(HAVE_OSS)
 	AC_SUBST(OSS_LIBS)
 
 	dnl SDL digital audio
diff --git a/config.d/svga.m4 b/config.d/svga.m4
index 63f064a35..d5ec23059 100644
--- a/config.d/svga.m4
+++ b/config.d/svga.m4
@@ -30,6 +30,5 @@ if test "x$HAVE_SVGA" != xno; then
 		SVGA_LIBS=
 	fi
 fi
-AC_SUBST(HAVE_SVGA)
 AC_SUBST(SVGA_CFLAGS)
 AC_SUBST(SVGA_LIBS)
diff --git a/config.d/versions.m4 b/config.d/versions.m4
index 2dde3f192..7550013d6 100644
--- a/config.d/versions.m4
+++ b/config.d/versions.m4
@@ -4,7 +4,7 @@ NQ_QSG_VERSION=1.0
 QW_VERSION=2.40
 QW_QSG_VERSION=2.0
 RPMVERSION=`echo $PACKAGE_VERSION | tr - _`
-AC_SUBST(RPMVERSION)
+QF_SUBST(RPMVERSION)
 
 AC_DEFINE_UNQUOTED(NQ_VERSION,		"$NQ_VERSION",
 	[Define this to the NetQuake standard version you support])
@@ -15,11 +15,6 @@ AC_DEFINE_UNQUOTED(QW_VERSION,		"$QW_VERSION",
 AC_DEFINE_UNQUOTED(QW_QSG_VERSION,	"$QW_QSG_VERSION",
 	[Define this to the QSG standard version you support in QuakeWorld])
 
-AC_SUBST(NQ_VERSION)
-AC_SUBST(NQ_QSG_VERSION)
-AC_SUBST(QW_VERSION)
-AC_SUBST(QW_QSG_VERSION)
-
 AC_ARG_ENABLE([version-info], AC_HELP_STRING([--enable-version-info=CURRENT:REVISION:AGE],
 	[Override the value passed to libtool -version-info.]),
 	[], [enable_version_info=1:0:0])
diff --git a/config.d/x11.m4 b/config.d/x11.m4
index 4737b6322..8a9d24fda 100644
--- a/config.d/x11.m4
+++ b/config.d/x11.m4
@@ -11,7 +11,6 @@ if test "x$mingw" != xyes; then
 	fi
 	AC_SUBST(X_SHM_LIB)
 fi
-AC_SUBST(HAVE_X)
 
 dnl Check for XFree86-VidMode support
 AC_ARG_ENABLE(vidmode,
diff --git a/m4/quakeforge.m4 b/m4/quakeforge.m4
index 4facfdf38..3f917cf03 100644
--- a/m4/quakeforge.m4
+++ b/m4/quakeforge.m4
@@ -77,15 +77,16 @@ if test $ac_cv_type_va_list_array = yes; then
 	AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if va_list is an array])
 fi])
 
+AC_DEFUN([QF_SUBST],
+[m4_ifset([AM_SUBST_NOTMAKE],[AM_SUBST_NOTMAKE([$1])], []) AC_SUBST([$1])]);
 
 AC_DEFUN([QF_DEPS], [
 $1_INCS='m4_normalize($2)'
 $1_DEPS='m4_normalize($3)'
 $1_LIBS='m4_normalize($3) m4_normalize($4)'
-AC_SUBST($1_INCS)
-AC_SUBST($1_DEPS)
-AC_SUBST($1_LIBS)
-])
+QF_SUBST($1_INCS)
+QF_SUBST($1_DEPS)
+QF_SUBST($1_LIBS)])
 
 AC_DEFUN([QF_NEED], [m4_map_args_w([$2], [$1_need_], [=yes], [;])])
 
@@ -106,15 +107,15 @@ fi
 AC_DEFUN([QF_PROCESS_NEED_LIBS],
 [m4_define([qfn_ext], m4_default($3,[la]))
 QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2])
-AC_SUBST([$1_libs])])
+QF_SUBST([$1_libs])])
 
 AC_DEFUN([QF_PROCESS_NEED_DIRS],
 [QF_PROCESS_NEED_subroutine([],[$1],[],[$1_dirs],[$2])
-AC_SUBST([$1_dirs])])
+QF_SUBST([$1_dirs])])
 
 AC_DEFUN([QF_PROCESS_NEED_PLUGINS],
 [QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2])
-AC_SUBST([$1_plugins])
+QF_SUBST([$1_plugins])
 m4_define([qfn_default], m4_default($3,$1)[_default])
 if test -z "${qfn_default}"; then
 	QF_PROCESS_NEED_FUNC([$1],[$2],[qfn_default=qfn_need])
@@ -126,7 +127,7 @@ AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_list]), [], [list of $1
 
 AC_DEFUN([QF_STATIC_PLUGIN_LIBS],
 [QF_PROCESS_NEED_subroutine(m4_join([/],[$4],[$2_]),[$2],[.la],[$1_static_plugin_libs],[$3])
-AC_SUBST([$1_static_plugin_libs])])
+QF_SUBST([$1_static_plugin_libs])])
 
 AC_DEFUN([QF_STATIC_PLUGIN_PROTOS],
 [QF_PROCESS_NEED_subroutine([extern plugin_t *$2_],[$2],[_PluginInfo (void);],[$1_plugin_protos],[$3])
@@ -143,7 +144,7 @@ AC_DEFINE_UNQUOTED(m4_toupper([$1_plugin_list]), [${$1_plugin_list}], [list of $
 
 AC_DEFUN([QF_PROCESS_NEED_STATIC_PLUGINS],
 [QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2])
-AC_SUBST(m4_default($4,$1)[_static_plugins])
+QF_SUBST(m4_default($4,$1)[_static_plugins])
 m4_define([qfn_default], m4_default($4,$1)[_default])
 if test -z "${qfn_default}"; then
 	QF_PROCESS_NEED_FUNC([$1],[$2],[qfn_default=qfn_need])