From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PwCiY-00085g-Ek for garchives@archives.gentoo.org; Sun, 06 Mar 2011 12:05:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C89C1C051; Sun, 6 Mar 2011 12:05:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2FFE01C052 for ; Sun, 6 Mar 2011 12:05:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFBC81B40D7 for ; Sun, 6 Mar 2011 12:05:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EC3D980073 for ; Sun, 6 Mar 2011 12:05:36 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: Subject: [gentoo-commits] proj/libbash:master commit in: / X-VCS-Repository: proj/libbash X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: f67465937c87b0887c1e0094e921b6469fc557a1 Date: Sun, 6 Mar 2011 12:05:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: aa1fe13c500c39a3196169ebb6d30bba commit: f67465937c87b0887c1e0094e921b6469fc557a1 Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Sun Mar 6 12:01:51 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Sun Mar 6 12:01:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Df6746593 Merge branch 'buildsystem' Conflicts: Makefile.am Makefile.am | 8 ++++++++ bashast/bashast.g | 42 +++++++++++++++++++++--------------------- configure.ac | 36 ++++++++++++++++++------------------ 3 files changed, 47 insertions(+), 39 deletions(-) diff --cc Makefile.am index 33064bb,09d7311..3f2cbab --- a/Makefile.am +++ b/Makefile.am @@@ -35,8 -34,11 +35,11 @@@ builtin_unittests_SOURCES +=3D src/builti builtin_unittests_LDADD =3D ${GTEST_LIBS} libcppbash.la endif =20 -AM_CXXFLAGS=3D-std=3Dc++0x +AM_CXXFLAGS=3D$(BOOST_CPPFLAGS) -std=3Dc++0x =20 + GENERATED_C =3D bashastLexer.c bashastParser.c + GENERATED_H =3D bashastLexer.h bashastParser.h + CLEANFILES =3D $(GENERATED_C) $(GENERATED_H) bashast.g lib_LTLIBRARIES =3D libcppbash.la libcppbash_la_SOURCES =3D src/cppbash_builtin.cpp libcppbash_la_SOURCES +=3D src/builtins/echo_builtin.cpp diff --cc configure.ac index 7b361f9,cbd5058..d9da894 --- a/configure.ac +++ b/configure.ac @@@ -19,10 -19,10 +19,10 @@@ dnl ################################### AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) AC_INIT([libbash],[0.1],[powerofazure@gmail.com]) - AM_INIT_AUTOMAKE([parallel-tests subdir-objects]) + AM_INIT_AUTOMAKE([foreign parallel-tests subdir-objects]) AC_PROG_CXX LT_INIT -AX_BOOST_BASE +AX_BOOST_BASE(1.43.0,[:],[AC_MSG_ERROR([Needed boost not found])]) AC_PATH_PROG([JAVA],[java],"no") if test "$JAVA" =3D "no"; then AC_MSG_ERROR([No java executable found])