This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[libstdc++ PATCH] do not override PACKAGE


Hi Phil,

This fixes the PACKAGE renaming issue the "Right Way".  Automake
actually has nothing to do about it.

BTW, there is a stray ">>>>>>> 1.1912" in libstdc++-v3/ChangeLog
around 2003-07-28.


2003-08-09  Alexandre Duret-Lutz  <adl@gnu.org>

	* configure.ac: Use the four-argument version of AC_INIT instead
	of overriding PACKAGE.

Index: configure.ac
===================================================================
RCS file: /cvsroot/gcc/gcc/libstdc++-v3/configure.ac,v
retrieving revision 1.1
diff -u -b -r1.1 configure.ac
--- configure.ac	5 Aug 2003 23:32:20 -0000	1.1
+++ configure.ac	8 Aug 2003 22:26:55 -0000
@@ -2,7 +2,7 @@
 # aclocal && autoconf && autoheader && automake
 
 AC_PREREQ(2.57)
-AC_INIT(libstdc++, version-unused)
+AC_INIT(libstdc++, version-unused,, libstdc++)
 AC_CONFIG_SRCDIR(src/ios.cc)
 AC_CONFIG_HEADER(config.h)
 
@@ -51,10 +51,6 @@
 #  -Wall:  turns on all automake warnings
 AM_INIT_AUTOMAKE([1.7.6 no-define foreign no-dependencies -Wall])
 
-# AM_INIT_AUTOMAKE sets this to the "smashed" format.  Calling the library
-# "libstdc--" causes remarkable amounts of breakage.  Thanks, automake.
-PACKAGE='libstdc++'
-
 # Runs configure.host, finds CC, CXX, and assorted other critical bits.  Sets
 # up critical shell variables.
 GLIBCXX_CONFIGURE
@@ -332,4 +328,3 @@
 
 dnl And this actually makes things happen:
 AC_OUTPUT
-

-- 
Alexandre Duret-Lutz


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]