aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-01-08 10:19:48 -0800
committerGlenn Morris2017-01-08 10:19:48 -0800
commitfc20bd940f41ef0784dba64c6518ddad7b63dca1 (patch)
tree456fe15139a66dc4d9d0d7f60cfdc3a2c4c8e4da
parent25d3297bb9c8feddac2e8bc018e6bc50603ba4a9 (diff)
downloademacs-fc20bd940f41ef0784dba64c6518ddad7b63dca1.tar.gz
emacs-fc20bd940f41ef0784dba64c6518ddad7b63dca1.zip
Remove unused configure output variable
* configure.ac (GNULIB_MK): * Makefile.in (gnulib_mk): Remove, no longer used.
-rw-r--r--Makefile.in3
-rw-r--r--configure.ac14
2 files changed, 0 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in
index 13879279866..60f30b993a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,9 +95,6 @@ configuration=@configuration@
95### The nt/ subdirectory gets built only for MinGW 95### The nt/ subdirectory gets built only for MinGW
96NTDIR=@NTDIR@ 96NTDIR=@NTDIR@
97 97
98### $(srcdir)/nt/gnulib.mk for MinGW, else $(srcdir)/lib/gnulib.mk
99gnulib_mk=@GNULIB_MK@
100
101# 'make' verbosity. 98# 'make' verbosity.
102AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ 99AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
103 100
diff --git a/configure.ac b/configure.ac
index 262f367f2c9..dcba7eb2c24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -771,20 +771,6 @@ if test x$GCC = xyes; then
771 test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS" 771 test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS"
772fi 772fi
773 773
774dnl This is used in lib/Makefile.am to use nt/gnulib.mk, the
775dnl alternative to lib/gnulib.mk, so as to avoid generating header files
776dnl that clash with MinGW.
777case $opsys in
778 mingw32 )
779 GNULIB_MK='$(srcdir)/nt/gnulib.mk'
780 ;;
781 * )
782 GNULIB_MK='$(srcdir)/lib/gnulib.mk'
783 ;;
784
785esac
786AC_SUBST([GNULIB_MK])
787
788AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"]) 774AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"])
789 775
790# Avoid gnulib's tests for -lcrypto, so that there's no static dependency on it. 776# Avoid gnulib's tests for -lcrypto, so that there's no static dependency on it.