summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-29 20:55:59 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-30 00:01:36 +0100
commit5de3b85f17d90e535f963313b4a645b28dacba33 (patch)
treef6c645b589efb807ce1c805873683caf6b99deaf /configure.ac
parent228313f32c472da1cb2f7cacf53a25fcd3e12fb3 (diff)
configure: remove newly unused variable MERGE_MODULES
Change-Id: Idb60c578f6dd3412a81b38aaf66d21674387a2e0
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 0 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 8f408f3041fb..f10f71db0c8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5178,8 +5178,6 @@ find_msms()
AC_MSG_WARN([Merge modules not found in $msmdir])
msmdir=""
fi
- else
- msms="Microsoft_VC${VCVER}_CRT_x86.msm"
fi
}
@@ -6600,14 +6598,12 @@ if test $_os = "WINNT" -a "$WITH_MINGW" != yes; then
MSVC_DLL_PATH="$msvcdllpath"
MSVC_DLLS="$msvcdlls"
MSM_PATH="$msmdir"
- MERGE_MODULES="$msms"
SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
fi
AC_SUBST(MSVC_DLL_PATH)
AC_SUBST(MSVC_DLLS)
AC_SUBST(MSM_PATH)
-AC_SUBST(MERGE_MODULES)
dnl ===================================================================
dnl Checks for Java