head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2000.03.02.22.51.13;	author bkoz;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.18.05.15.06;	author bkoz;	state Exp;
branches;
next	1.1;

1.1
date	2000.02.02.08.45.23;	author bkoz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@
2000-03-02  Alexandre Oliva  <oliva@@lsd.ic.unicamp.br>
	    Chip Salzenberg  <chip@@valinux.com>
	    Petter Urkedal  <petter@@matfys.lth.se>

	* src/Makefile.am (myinstallheaders): Hack to avoid
        `for i in ; do'.
	* src/Makefile.in: Regenerate.

2000-03-02  Chip Salzenberg  <chip@@valinux.com>

        * libio/Makefile.an, math/Makefile.an, src/Makefile.am
        (LINK): Put quotes around "$(CC)" for libtool link mode,
        so libtool will use "-B" options during GCC bootstrap.
        * */Makefile.in: Regenerate.

2000-03-02  Petter Urkedal  <petter@@matfys.lth.se>

        * config/c_io_libio.h: Enclose it all in ::std.
        * bits/basic_string.h (basic_string<>): Make types and
        `npos' public.
        * mkc++config: Truncate output file before writing.
@
text
@#! /bin/sh

# 2000-02-01 bkoz 
# Script to take the generated "config.h" from autoconf and make the
# macros within it namespace safe (ie wrapping them in _GLIBCPP_ so
# that "HAVE_LC_MESSAGES" becomes "_GLIBCPP_HAVE_LC_MESSAGES" etc etc.

echo "running mkc++config"

BUILD_DIR=$1
if [ ! -d "$BUILD_DIR" ]; then
  echo "build directory $BUILD_DIR not found, exiting."
  exit 1
fi

SRC_DIR=$2
if [ ! -d "$SRC_DIR" ]; then
  echo "source directory $SRC_DIR not found, exiting."
  exit 1
fi

BASE_H="$SRC_DIR/bits/c++config.h"
IN_H="$BUILD_DIR/config.h"
OUT_H="$BUILD_DIR/bits/c++config.h"

if [ ! -f $IN_H ]; then
  echo "necessary file $IN_H not found, exiting"
  exit 1
fi

if [ ! -d "$BUILD_DIR/bits" ]; then
  mkdir  "$BUILD_DIR/bits"
fi


# Part 1
# sed config.h from autoconf and make it namespace safe.
sed 's/HAVE_/_GLIBCPP_HAVE_/g' < $IN_H > temp-1
sed 's/PACKAGE/_GLIBCPP_PACKAGE/g' < temp-1 > temp-2
sed 's/VERSION/_GLIBCPP_VERSION/g' < temp-2 > temp-3
sed 's/WORDS_/_GLIBCPP_WORDS_/g' < temp-3 > temp-4


# Part 2
# cat this into generated bits/c++config.h
cat $BASE_H temp-4 > $OUT_H
rm temp-1 temp-2 temp-3 temp-4


# Part 3
# complete macro guards for resulting file
cat <<EOF >> $OUT_H

#endif // _CPP_CPPCONFIG_
EOF

exit 0

@


1.2
log
@
2000-02-17  Benjamin Kosnik  <bkoz@@decepticon.cygnus.com>

	* mkc++config (OUT_H): Remove EOF in cygwin.
	* acinclude.m4 (LIBS): Tweaks to allow cygwin to configure.

        Tom Tromey  <tromey@@cygnus.com>
	* src/Makefile.am: Tweaks for installing multilibs.
@
text
@d46 1
a46 1
cat $BASE_H temp-4 >> $OUT_H
@


1.1
log
@
2000-02-02  Benjamin Kosnik  <bkoz@@cygnus.com>
	    Alexandre Petit-Bianco  <apbianco@@cygnus.com>

	* mkc++config: New file. Put autoconf macros into _GLIBCPP_
	namespace instead of polluting global namespace with duplicate
	autoconf output.
	* configure.in (AC_OUTPUT): Don't need to generate bits/config.h
	here anymore. . .
	(AC_OUTPUT_COMMANDS): Make it here.
	* configure: Regenerate.
	* bits/c++config.h.in (_CPP_CPPCONFIG): Change. Tweak. Remove
	endif, as now we will add it manually.
	Move to this file. . .
	* bits/c++config.h: New file. Same as old c++config.h.in except
	the ending macro guard is now appended manually.

	* bits/locale_facets.tcc: Change HAVE_* macros to _GLIBCPP_HAVE_*.
	* bits/std_cmath.h: Same here.
	* bits/std_cwchar.h: And here.
	* src/locale.cc: And here.
	* src/complexl.cc: And here.
	* math/mathconf.h: Change to include "config.h" instead of
	bits/c++config.h.
@
text
@d47 1
a47 1
rm temp-?
d53 1
d55 4
a58 1
EOF@

