Create directory for new-abi-baseline

[Andreas Jaeger <aj at suse dot de>]

The following patch generates the directory for the check-abi baseline
file if it does not exist.

Tested on i686-linux-gnu.  Ok to commit?

Andreas

2003-06-17  Andreas Jaeger  <aj@suse.de>

	* testsuite/Makefile.am (new-abi-baseline): Create baseline
	directory.
	(baseline_file): Use baseline_dir.
	(baseline_dir): New.
	(mkinstalldirs): New.

	* acinclude.m4: Rename baseline_file to baseline_dir, strip
	filename from baseline_dir.

	* testsuite/Makefile.in: Regenerated.
	* Makefile.in: Regenerated.
	* aclocal.m4: Regenerated.
	* configure: Regenerated.


============================================================
Index: libstdc++-v3/testsuite/Makefile.am
--- testsuite/Makefile.am	17 Jun 2003 05:46:01 -0000	1.19
+++ testsuite/Makefile.am	17 Jun 2003 19:18:06 -0000
@@ -23,6 +23,8 @@
 
 AUTOMAKE_OPTIONS =  cygnus dejagnu
 
+mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
+
 DEJATOOL = libstdc++-v3
 
 EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
@@ -78,7 +80,8 @@ check-am: 
 
 check-local: check-abi
 
-baseline_file = @baseline_file@
+baseline_dir = @baseline_dir@
+baseline_file = ${baseline_dir}/baseline_symbols.txt
 extract_symvers = @glibcpp_srcdir@/config/abi/extract_symvers
 
 current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
@@ -94,6 +97,7 @@ baseline_symbols:
 	touch baseline_symbols)
 
 new-abi-baseline: 
+	-@$(mkinstalldirs) ${baseline_dir}
 	-@(output=${baseline_file}; \
 	  if test -f $${output}; then \
 	    output=$${output}.new; \
============================================================
Index: libstdc++-v3/testsuite/Makefile.in
--- testsuite/Makefile.in	17 Jun 2003 05:46:01 -0000	1.49
+++ testsuite/Makefile.in	17 Jun 2003 19:18:06 -0000
@@ -142,16 +142,14 @@ toplevel_srcdir = @toplevel_srcdir@
 
 AUTOMAKE_OPTIONS = cygnus dejagnu
 
+mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
+
 DEJATOOL = libstdc++-v3
 
-EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
-            echo @glibcpp_builddir@/../../expect/expect ; \
-          else echo expect ; fi`
+EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then             echo @glibcpp_builddir@/../../expect/expect ;           else echo expect ; fi`
 
 
-RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
-	       echo @glibcpp_srcdir@/../dejagnu/runtest ; \
-	    else echo runtest; fi`
+RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then 	       echo @glibcpp_srcdir@/../dejagnu/runtest ; 	    else echo runtest; fi`
 
 
 AM_RUNTESTFLAGS = 
@@ -159,31 +157,25 @@ RUNTESTFLAGS = 
 
 CXX_build = @glibcpp_CXX@ 
 CXX = `echo "$(CXX_build)" | sed 's,gcc/xgcc ,gcc/g++ ,'`
-CXXLINK = \
-	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
-	$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK =  	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs 	$(LIBTOOL) --tag=CXX --mode=link $(CXX) 	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
 
-INCLUDES = \
-	-nostdinc++ \
-	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
+INCLUDES =  	-nostdinc++ 	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
 
 
 noinst_LIBRARIES = libv3test.a
 libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
-@GLIBCPP_TEST_ABI_TRUE@noinst_PROGRAMS = @GLIBCPP_TEST_ABI_TRUE@abi_check
+@GLIBCPP_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check
 @GLIBCPP_TEST_ABI_FALSE@noinst_PROGRAMS = 
 abi_check_SOURCES = abi_check.cc
 
-baseline_file = @baseline_file@
+baseline_dir = @baseline_dir@
+baseline_file = ${baseline_dir}/baseline_symbols.txt
 extract_symvers = @glibcpp_srcdir@/config/abi/extract_symvers
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
-	     testsuite_* site.exp abi_check 
+CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum 	     testsuite_* site.exp abi_check 
 
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
@@ -493,6 +485,7 @@ baseline_symbols:
 	touch baseline_symbols)
 
 new-abi-baseline: 
+	-@$(mkinstalldirs) ${baseline_dir}
 	-@(output=${baseline_file}; \
 	  if test -f $${output}; then \
 	    output=$${output}.new; \
============================================================
Index: libstdc++-v3/acinclude.m4
--- libstdc++-v3/acinclude.m4	17 Jun 2003 05:45:58 -0000	1.245
+++ libstdc++-v3/acinclude.m4	17 Jun 2003 19:18:07 -0000
@@ -2059,8 +2059,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   fi
 
   # Export file names for ABI checking.
-  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)/baseline_symbols.txt"
-  AC_SUBST(baseline_file)
+  baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
+  AC_SUBST(baseline_dir)
 
   # Determine if checking the ABI is desirable.
   if test x$enable_symvers = xno; then
============================================================
Index: libstdc++-v3/aclocal.m4
--- libstdc++-v3/aclocal.m4	17 Jun 2003 05:45:59 -0000	1.258
+++ libstdc++-v3/aclocal.m4	17 Jun 2003 19:18:08 -0000
@@ -2071,8 +2071,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   fi
 
   # Export file names for ABI checking.
-  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)/baseline_symbols.txt"
-  AC_SUBST(baseline_file)
+  baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
+  AC_SUBST(baseline_dir)
 
   # Determine if checking the ABI is desirable.
   if test x$enable_symvers = xno; then
============================================================
Index: libstdc++-v3/configure
--- libstdc++-v3/configure	17 Jun 2003 05:45:59 -0000	1.322
+++ libstdc++-v3/configure	17 Jun 2003 19:18:11 -0000
@@ -23607,7 +23607,7 @@ done
   fi
 
   # Export file names for ABI checking.
-  baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)/baseline_symbols.txt"
+  baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
   
 
   # Determine if checking the ABI is desirable.
@@ -24095,7 +24095,7 @@ s%@WERROR@%$WERROR%g
 s%@SYMVER_MAP@%$SYMVER_MAP%g
 s%@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE%g
 s%@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE%g
-s%@baseline_file@%$baseline_file%g
+s%@baseline_dir@%$baseline_dir%g
 s%@GLIBCPP_TEST_WCHAR_T_TRUE@%$GLIBCPP_TEST_WCHAR_T_TRUE%g
 s%@GLIBCPP_TEST_WCHAR_T_FALSE@%$GLIBCPP_TEST_WCHAR_T_FALSE%g
 s%@GLIBCPP_TEST_ABI_TRUE@%$GLIBCPP_TEST_ABI_TRUE%g

-- 
 Andreas Jaeger, SuSE Linux AG, aj@suse.de, http://www.suse.de/~aj
  GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature