Commit 04e78786 by Hans-Peter Nilsson

Makefile.am (VPATH): Delimit with ":", not space.

	* src/Makefile.am (VPATH): Delimit with ":", not space.
	* src/Makefile.in: Regenerate.

	* configure.in (use of GLIBCPP_CHECK_GNU_MAKE): Don't fail if GNU
	make isn't found.
	* configure: Regenerate.

From-SVN: r42774
parent db3f0336
...@@ -2556,9 +2556,9 @@ echo "$ac_t""$_cv_gnu_make_command" 1>&6 ; ...@@ -2556,9 +2556,9 @@ echo "$ac_t""$_cv_gnu_make_command" 1>&6 ;
fi fi
if test "x$_cv_gnu_make_command" = "x"; then
{ echo "configure: error: GNU make not found. Please install it or correct your path." 1>&2; exit 1; }
fi
......
...@@ -51,9 +51,9 @@ AM_PROG_LIBTOOL ...@@ -51,9 +51,9 @@ AM_PROG_LIBTOOL
AC_SUBST(enable_shared) AC_SUBST(enable_shared)
AC_SUBST(enable_static) AC_SUBST(enable_static)
GLIBCPP_CHECK_GNU_MAKE GLIBCPP_CHECK_GNU_MAKE
if test "x$_cv_gnu_make_command" = "x"; then
AC_MSG_ERROR([GNU make not found. Please install it or correct your path.])
fi
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
# Check for c++ or library specific bits that don't require linking. # Check for c++ or library specific bits that don't require linking.
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
## $Id: Makefile.am,v 1.84 2001/04/18 01:06:04 bkoz Exp $ ## $Id: Makefile.am,v 1.85 2001/05/19 03:42:53 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
...@@ -173,9 +173,7 @@ sources = \ ...@@ -173,9 +173,7 @@ sources = \
string-inst.cc wstring-inst.cc string-inst.cc wstring-inst.cc
VPATH += $(top_srcdir) $(top_srcdir)/src VPATH = $(top_srcdir):$(top_srcdir)/src:$(GLIBCPP_INCLUDE_DIR):$(GLIBCPP_INCLUDE_DIR)/std:$(C_INCLUDE_DIR)
VPATH += $(GLIBCPP_INCLUDE_DIR)
VPATH += $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
libstdc___la_SOURCES = $(sources) libstdc___la_SOURCES = $(sources)
......
...@@ -167,7 +167,7 @@ build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++local ...@@ -167,7 +167,7 @@ build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++local
sources = limitsMEMBERS.cc stdexcept.cc functexcept.cc bitset.cc globals.cc basic_file.cc ios.cc complex_io.cc strstream.cc c++locale.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc wstring-inst.cc sources = limitsMEMBERS.cc stdexcept.cc functexcept.cc bitset.cc globals.cc basic_file.cc ios.cc complex_io.cc strstream.cc c++locale.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc wstring-inst.cc
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR) $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR) VPATH = $(top_srcdir):$(top_srcdir)/src:$(GLIBCPP_INCLUDE_DIR):$(GLIBCPP_INCLUDE_DIR)/std:$(C_INCLUDE_DIR)
libstdc___la_SOURCES = $(sources) libstdc___la_SOURCES = $(sources)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment