diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-03-10 09:46:40 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-03-10 09:46:40 +0000 |
| commit | 66c338c1fe3a769f829da1f7a854df8f152ec937 (patch) | |
| tree | 1785be0b770ccdda1ee382a8e6a39c7bef93b8f0 | |
| parent | version bump. (diff) | |
| download | gentoo-2-66c338c1fe3a769f829da1f7a854df8f152ec937.tar.gz gentoo-2-66c338c1fe3a769f829da1f7a854df8f152ec937.tar.bz2 gentoo-2-66c338c1fe3a769f829da1f7a854df8f152ec937.zip | |
Update m4 macro.
(Portage version: 2.0.51.19)
| -rw-r--r-- | dev-libs/klibc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/klibc/files/klibc.m4 | 37 |
2 files changed, 32 insertions, 10 deletions
diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog index 85cc1c9dab93..5af906c9ea83 100644 --- a/dev-libs/klibc/ChangeLog +++ b/dev-libs/klibc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/klibc # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.3 2005/03/10 08:49:28 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.4 2005/03/10 09:46:40 azarah Exp $ + + 10 Mar 2005; Martin Schlemmer <azarah@gentoo.org> files/klibc.m4: + Update m4 macro. *klibc-1.0.3 (10 Mar 2005) diff --git a/dev-libs/klibc/files/klibc.m4 b/dev-libs/klibc/files/klibc.m4 index 33a659ad8752..4e7db6489667 100644 --- a/dev-libs/klibc/files/klibc.m4 +++ b/dev-libs/klibc/files/klibc.m4 @@ -31,12 +31,27 @@ AC_DEFUN([AC_CHECK_KLIBC], AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_ENABLE([klibc], [AS_HELP_STRING([--enable-klibc], - [Use this to link the tools to klibc. Set KLCC + [Enable linking to klibc [no]. You need at + least klibc-1.0 or later for this. Set KLCC to the absolute file name of klcc if not in - the PATH.])], - [KLIBC=yes], [KLIBC=no]) + the PATH])], + [KLIBC=$enableval], [KLIBC=no]) +AC_ARG_ENABLE([klibc-layout], + [AS_HELP_STRING([--enable-klibc-layout], + [Enable installing binaries, libraries and + headers into the klibc prefix [yes] ])], + [if test "X$KLIBC" != Xno; then + KLIBC_LAYOUT=$enableval + else + KLIBC_LAYOUT=no + fi], + [if test "X$KLIBC" != Xno; then + KLIBC_LAYOUT=yes + else + KLIBC_LAYOUT=no + fi]) -if test "X$KLIBC" = Xyes; then +if test "X$KLIBC" != Xno; then # Basic cross compiling support. I do not think it is wise to use # AC_CHECK_TOOL, because if we are cross compiling, we do not want # just 'klcc' to be returned ... @@ -51,6 +66,7 @@ if test "X$KLIBC" = Xyes; then CC="$KLCC" CFLAGS="-Os" + KLIBC_KCROSS="$($KLCC -print-klibc-kcross 2>/dev/null)" KLIBC_PREFIX="$($KLCC -print-klibc-prefix 2>/dev/null)" KLIBC_BIN_DIR="$($KLCC -print-klibc-bindir 2>/dev/null)" @@ -58,6 +74,14 @@ if test "X$KLIBC" = Xyes; then KLIBC_LIB_DIR="$($KLCC -print-klibc-libdir 2>/dev/null)" KLIBC_INCLUDE_DIR="$($KLCC -print-klibc-includedir 2>/dev/null)" + if test "X$KLIBC_LAYOUT" != Xno; then + prefix="$KLIBC_PREFIX" + bindir="$KLIBC_BIN_DIR" + sbindir="$KLIBC_SBIN_DIR" + libdir="$KLIBC_LIB_DIR" + includedir="$KLIBC_INCLUDE_DIR" + fi + # At least KLIBC_LIB_DIR should be valid, else klibc is too old or # something went wrong if test ! -d "$KLIBC_LIB_DIR"; then @@ -66,10 +90,5 @@ if test "X$KLIBC" = Xyes; then fi AC_SUBST(KLIBC) -AC_SUBST(KLIBC_PREFIX) -AC_SUBST(KLIBC_BIN_DIR) -AC_SUBST(KLIBC_SBIN_DIR) -AC_SUBST(KLIBC_LIB_DIR) -AC_SUBST(KLIBC_INCLUDE_DIR) ])# AC_CHECK_KLIBC |