From reid at hlvm.org Mon May 8 18:47:55 2006 From: reid at hlvm.org (reid at hlvm.org) Date: Mon, 8 May 2006 19:47:55 -0400 Subject: [hlvm-commits] r27 - hlvm/Base Message-ID: <200605082347.k48NlttO028212@sneezy.swagora.com> Author: reid Date: 2006-05-08 19:47:55 -0400 (Mon, 08 May 2006) New Revision: 27 Log: Have this makefile actually build something. Modified: hlvm/Base/Makefile Modified: hlvm/Base/Makefile =================================================================== --- hlvm/Base/Makefile 2006-05-06 06:13:54 UTC (rev 26) +++ hlvm/Base/Makefile 2006-05-08 23:47:55 UTC (rev 27) @@ -1,12 +1,11 @@ ##===- hlvm/Base/Makefile ----------------------------------*- Makefile -*-===## # -# Relative path to the top of the source tree. -# LEVEL=../.. - -# -# List all of the subdirectories that we will compile. -# DIRS= +LIBRARYNAME = HLVMBase +DONT_BUILD_RELINKED := 1 +BUILD_ARCHIVE := 1 +INSTALL_INCLUDES := Config.h URI.h URI.i + include $(LEVEL)/Makefile.hlvm _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Mon May 8 18:55:04 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Mon, 8 May 2006 19:55:04 -0400 Subject: [hlvm-commits] r29 - in hlvm/Reader: . Yaml Message-ID: <200605082355.k48Nt45V028282@sneezy.swagora.com> Author: reid Date: 2006-05-08 19:55:03 -0400 (Mon, 08 May 2006) New Revision: 29 Log: Add the Yaml directory to be compiled and make sure it has a Makefile. Added: hlvm/Reader/Yaml/Makefile Modified: hlvm/Reader/Makefile Modified: hlvm/Reader/Makefile =================================================================== --- hlvm/Reader/Makefile 2006-05-08 23:52:09 UTC (rev 28) +++ hlvm/Reader/Makefile 2006-05-08 23:55:03 UTC (rev 29) @@ -7,6 +7,6 @@ # # List all of the subdirectories that we will compile. # -DIRS=XML +DIRS=XML Yaml include $(LEVEL)/Makefile.hlvm Added: hlvm/Reader/Yaml/Makefile =================================================================== --- hlvm/Reader/Yaml/Makefile 2006-05-08 23:52:09 UTC (rev 28) +++ hlvm/Reader/Yaml/Makefile 2006-05-08 23:55:03 UTC (rev 29) @@ -0,0 +1,5 @@ +##===- hlvm/Reader/XML/Makefile ----------------------------*- Makefile -*-===## +LEVEL=../../.. +DIRS= + +include $(LEVEL)/Makefile.hlvm Property changes on: hlvm/Reader/Yaml/Makefile ___________________________________________________________________ Name: svn:executable + * _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Mon May 8 18:52:10 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Mon, 8 May 2006 19:52:10 -0400 Subject: [hlvm-commits] r28 - hlvm/Reader Message-ID: <200605082352.k48NqABJ028261@sneezy.swagora.com> Author: reid Date: 2006-05-08 19:52:09 -0400 (Mon, 08 May 2006) New Revision: 28 Log: Add a Yaml Directory for the Yaml Reader. Added: hlvm/Reader/Yaml/ _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From hlvm-commits-owner at hlvm.org Mon May 8 18:55:05 2006 From: hlvm-commits-owner at hlvm.org (hlvm-commits-owner at hlvm.org) Date: Mon, 08 May 2006 19:55:05 -0400 Subject: hlvm-commits post from rspencer@reidspencer.com requires approval Message-ID: As list administrator, your authorization is requested for the following mailing list posting: List: hlvm-commits at hlvm.org From: rspencer at reidspencer.com Subject: r29 - in hlvm/Reader: . Yaml Reason: Post to moderated list At your convenience, visit: http://hlvm.org/mailman/admindb/hlvm-commits to approve or deny the request. -------------- next part -------------- An embedded message was scrubbed... From: rspencer at reidspencer.com Subject: r29 - in hlvm/Reader: . Yaml Date: Mon, 8 May 2006 19:55:04 -0400 Size: 1801 Url: http://hlvm.org/pipermail/hlvm-commits/attachments/20060508/c74f9cac/attachment.mht -------------- next part -------------- An embedded message was scrubbed... From: hlvm-commits-request at hlvm.org Subject: confirm 03003d890e2973c3c58ad185ff93c7eac3911c20 Date: Mon, 08 May 2006 16:55:29 -0700 Size: 728 Url: http://hlvm.org/pipermail/hlvm-commits/attachments/20060508/c74f9cac/attachment-0001.mht From hlvm-commits-bounces at hlvm.org Mon May 8 18:55:05 2006 From: hlvm-commits-bounces at hlvm.org (hlvm-commits-bounces at hlvm.org) Date: Mon, 08 May 2006 19:55:05 -0400 Subject: Your message to hlvm-commits awaits moderator approval Message-ID: Your mail to 'hlvm-commits' with the subject r29 - in hlvm/Reader: . Yaml Is being held until the list moderator can review it for approval. The reason it is being held: Post to moderated list Either the message will get posted to the list, or you will receive notification of the moderator's decision. If you would like to cancel this posting, please visit the following URL: http://hlvm.org/mailman/confirm/hlvm-commits/03003d890e2973c3c58ad185ff93c7eac3911c20 From hlvm-commits-owner at hlvm.org Mon May 8 18:52:24 2006 From: hlvm-commits-owner at hlvm.org (hlvm-commits-owner at hlvm.org) Date: Mon, 08 May 2006 19:52:24 -0400 Subject: hlvm-commits post from rspencer@reidspencer.com requires approval Message-ID: As list administrator, your authorization is requested for the following mailing list posting: List: hlvm-commits at hlvm.org From: rspencer at reidspencer.com Subject: r28 - hlvm/Reader Reason: Post to moderated list At your convenience, visit: http://hlvm.org/mailman/admindb/hlvm-commits to approve or deny the request. -------------- next part -------------- An embedded message was scrubbed... From: rspencer at reidspencer.com Subject: r28 - hlvm/Reader Date: Mon, 8 May 2006 19:52:10 -0400 Size: 838 Url: http://hlvm.org/pipermail/hlvm-commits/attachments/20060508/9c2e0602/attachment.mht -------------- next part -------------- An embedded message was scrubbed... From: hlvm-commits-request at hlvm.org Subject: confirm 00f729edc91e7b6efb15256424360c30d6fcdc63 Date: Mon, 08 May 2006 16:55:23 -0700 Size: 728 Url: http://hlvm.org/pipermail/hlvm-commits/attachments/20060508/9c2e0602/attachment-0001.mht From hlvm-commits-bounces at hlvm.org Mon May 8 18:52:23 2006 From: hlvm-commits-bounces at hlvm.org (hlvm-commits-bounces at hlvm.org) Date: Mon, 08 May 2006 19:52:23 -0400 Subject: Your message to hlvm-commits awaits moderator approval Message-ID: Your mail to 'hlvm-commits' with the subject r28 - hlvm/Reader Is being held until the list moderator can review it for approval. The reason it is being held: Post to moderated list Either the message will get posted to the list, or you will receive notification of the moderator's decision. If you would like to cancel this posting, please visit the following URL: http://hlvm.org/mailman/confirm/hlvm-commits/00f729edc91e7b6efb15256424360c30d6fcdc63 From rspencer at reidspencer.com Wed May 10 01:06:04 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Wed, 10 May 2006 02:06:04 -0400 Subject: [hlvm-commits] r30 - / Message-ID: <200605100606.k4A6642A030749@sneezy.swagora.com> Author: reid Date: 2006-05-10 02:06:03 -0400 (Wed, 10 May 2006) New Revision: 30 Log: We won't use the lib and include style directories in HLVM like LLVM does. Both headers and sources go in the appropriate modules under "hlvm". This reduces directory switching and makes the build tree shallower. Removed: include/ lib/ _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Wed May 10 01:07:31 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Wed, 10 May 2006 02:07:31 -0400 Subject: [hlvm-commits] r31 - / autoconf Message-ID: <200605100607.k4A67VVF030764@sneezy.swagora.com> Author: reid Date: 2006-05-10 02:07:30 -0400 (Wed, 10 May 2006) New Revision: 31 Log: Make configure find the APR Utils package and ensure that compiler flags are passed on to the makefile by incorporating the variables into Makefile.config.in Modified: Makefile.config.in autoconf/configure.ac configure Modified: Makefile.config.in =================================================================== --- Makefile.config.in 2006-05-10 06:06:03 UTC (rev 30) +++ Makefile.config.in 2006-05-10 06:07:30 UTC (rev 31) @@ -56,3 +56,8 @@ # Set the root directory of this project's install prefix PROJ_INSTALL_ROOT := @prefix@ + +CXXFLAGS := @CXXFLAGS@ +CPPFLAGS := @CPPFLAGS@ +CFLAGS := @CFLAGS@ +LIBS := @LIBS@ Modified: autoconf/configure.ac =================================================================== --- autoconf/configure.ac 2006-05-10 06:06:03 UTC (rev 30) +++ autoconf/configure.ac 2006-05-10 06:07:30 UTC (rev 31) @@ -19,6 +19,7 @@ dnl * Set the location of various third-party software packages dnl ************************************************************************** FIND_PACKAGE([apr],[apr-1/apr.h],[libapr-1.so],[],[Apache Portable Runtime]) +FIND_PACKAGE([apr-util],[apr-1/apu.h],[libaprutil-1.so],[],[Apache Portable Runtime Utilities]) dnl ---------------------------------------------------------------------------- dnl -- Shared Object Versioning For libtool @@ -334,7 +335,7 @@ dnl -- SECTION 5: Check For Needed Header Files dnl -- dnl ---------------------------------------------------------------------------- -AC_CHECK_HEADERS([apr-1/apr.h expat.h llvm/Module.h]) +AC_CHECK_HEADERS([apr-1/apr.h apr-1/apu.h expat.h llvm/Module.h]) dnl ---------------------------------------------------------------------------- dnl -- Modified: configure =================================================================== --- configure 2006-05-10 06:06:03 UTC (rev 30) +++ configure 2006-05-10 06:07:30 UTC (rev 31) @@ -881,6 +881,14 @@ in DIR --with-APR-inc=DIR Specify that the Apache Portable Runtime includes are in DIR + --with-APR-UTIL=DIR Specify that the Apache Portable Runtime Utilities + install prefix is DIR + --with-APR-UTIL-bin=DIR Specify that the Apache Portable Runtime Utilities + binary is in DIR + --with-APR-UTIL-lib=DIR Specify that Apache Portable Runtime Utilities + libraries are in DIR + --with-APR-UTIL-inc=DIR Specify that the Apache Portable Runtime Utilities + includes are in DIR --with-workspace= dir=location of the HLVM workspace storage (default=/opt/hlvm) --with-expat= Specify where the expat lbrary is located @@ -1630,6 +1638,265 @@ fi +echo "$as_me:$LINENO: checking for Apache Portable Runtime Utilities bin/lib/include locations" >&5 +echo $ECHO_N "checking for Apache Portable Runtime Utilities bin/lib/include locations... $ECHO_C" >&6 + +# Check whether --with-APR-UTIL or --without-APR-UTIL was given. +if test "${with_APR_UTIL+set}" = set; then + withval="$with_APR_UTIL" + apr-utilpfxdir=$withval +else + apr-utilpfxdir=nada +fi; + +# Check whether --with-APR-UTIL-bin or --without-APR-UTIL-bin was given. +if test "${with_APR_UTIL_bin+set}" = set; then + withval="$with_APR_UTIL_bin" + apr-utilbindir=$withval +else + apr-utilbindir=nada +fi; + +# Check whether --with-APR-UTIL-lib or --without-APR-UTIL-lib was given. +if test "${with_APR_UTIL_lib+set}" = set; then + withval="$with_APR_UTIL_lib" + apr-utillibdir=$withval +else + apr-utillibdir=nada +fi; + +# Check whether --with-APR-UTIL-inc or --without-APR-UTIL-inc was given. +if test "${with_APR_UTIL_inc+set}" = set; then + withval="$with_APR_UTIL_inc" + apr-utilincdir=$withval +else + apr-utilincdir=nada +fi; +eval pfxval=\$\{apr-utilpfxdir\} +eval binval=\$\{apr-utilbindir\} +eval incval=\$\{apr-utilincdir\} +eval libvar=\$\{apr-utillibdir\} +if test "${pfxval}" != "nada" ; then + +if test -n "${pfxval}" -a -d "${pfxval}" -a -n "" -a -d "${pfxval}/bin" -a -x "${pfxval}/bin/" ; then + USE_="USE_ = 1" + + =${pfxval}/bin/ + + _BIN=${pfxval}/bin + + _DIR=${pfxval} + + if test -n "apr-1/apu.h" -a -d "${pfxval}/include" -a -f "${pfxval}/include/apr-1/apu.h" ; then + _INC=${pfxval}/include + + fi + if test -n "libaprutil-1.so" -a -d "${pfxval}/lib" -a -f "${pfxval}/lib/libaprutil-1.so" ; then + _LIB=${pfxval}/lib + + fi +fi + +elif test "${binval}" != "nada" ; then + if test "${libval}" != "nada" ; then + if test "${incval}" != "nada" ; then + if test -d "${binval}" ; then + if test -d "${incval}" ; then + if test -d "${libval}" ; then + =${binval}/apr-util + + _BIN=${binval} + + _INC=${incval} + + _LIB=${libval} + + USE_=1 + + echo "$as_me:$LINENO: result: found via --with options" >&5 +echo "${ECHO_T}found via --with options" >&6 + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-util-libdir value must be a directory" >&5 +echo "$as_me: error: The --with-apr-util-libdir value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-util-incdir value must be a directory" >&5 +echo "$as_me: error: The --with-apr-util-incdir value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-util-bindir value must be a directory" >&5 +echo "$as_me: error: The --with-apr-util-bindir value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-util-incdir option must be specified" >&5 +echo "$as_me: error: The --with-apr-util-incdir option must be specified" >&2;} + { (exit 1); exit 1; }; } + fi + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-util-libdir option must be specified" >&5 +echo "$as_me: error: The --with-apr-util-libdir option must be specified" >&2;} + { (exit 1); exit 1; }; } + fi +else + tmppfxdir=`which apr-util 2>&1` + if test -n "$tmppfxdir" -a -d "${tmppfxdir%*apr-util}" -a \ + -d "${tmppfxdir%*apr-util}/.." ; then + tmppfxdir=`cd "${tmppfxdir%*apr-util}/.." ; pwd` + +if test -n "$tmppfxdir" -a -d "$tmppfxdir" -a -n "" -a -d "$tmppfxdir/bin" -a -x "$tmppfxdir/bin/" ; then + USE_="USE_ = 1" + + =$tmppfxdir/bin/ + + _BIN=$tmppfxdir/bin + + _DIR=$tmppfxdir + + if test -n "apr-1/apu.h" -a -d "$tmppfxdir/include" -a -f "$tmppfxdir/include/apr-1/apu.h" ; then + _INC=$tmppfxdir/include + + fi + if test -n "libaprutil-1.so" -a -d "$tmppfxdir/lib" -a -f "$tmppfxdir/lib/libaprutil-1.so" ; then + _LIB=$tmppfxdir/lib + + fi +fi + + echo "$as_me:$LINENO: result: found in PATH at $tmppfxdir" >&5 +echo "${ECHO_T}found in PATH at $tmppfxdir" >&6 + else + checkresult="yes" + eval checkval=\$\{"USE_"\} + +if test -n "/usr" -a -d "/usr" -a -n "" -a -d "/usr/bin" -a -x "/usr/bin/" ; then + USE_="USE_ = 1" + + =/usr/bin/ + + _BIN=/usr/bin + + _DIR=/usr + + if test -n "apr-1/apu.h" -a -d "/usr/include" -a -f "/usr/include/apr-1/apu.h" ; then + _INC=/usr/include + + fi + if test -n "libaprutil-1.so" -a -d "/usr/lib" -a -f "/usr/lib/libaprutil-1.so" ; then + _LIB=/usr/lib + + fi +fi + + if test -z "${checkval}" ; then + +if test -n "/usr/local" -a -d "/usr/local" -a -n "" -a -d "/usr/local/bin" -a -x "/usr/local/bin/" ; then + USE_="USE_ = 1" + + =/usr/local/bin/ + + _BIN=/usr/local/bin + + _DIR=/usr/local + + if test -n "apr-1/apu.h" -a -d "/usr/local/include" -a -f "/usr/local/include/apr-1/apu.h" ; then + _INC=/usr/local/include + + fi + if test -n "libaprutil-1.so" -a -d "/usr/local/lib" -a -f "/usr/local/lib/libaprutil-1.so" ; then + _LIB=/usr/local/lib + + fi +fi + + if test -z "${checkval}" ; then + +if test -n "/sw" -a -d "/sw" -a -n "" -a -d "/sw/bin" -a -x "/sw/bin/" ; then + USE_="USE_ = 1" + + =/sw/bin/ + + _BIN=/sw/bin + + _DIR=/sw + + if test -n "apr-1/apu.h" -a -d "/sw/include" -a -f "/sw/include/apr-1/apu.h" ; then + _INC=/sw/include + + fi + if test -n "libaprutil-1.so" -a -d "/sw/lib" -a -f "/sw/lib/libaprutil-1.so" ; then + _LIB=/sw/lib + + fi +fi + + if test -z "${checkval}" ; then + +if test -n "/opt" -a -d "/opt" -a -n "" -a -d "/opt/bin" -a -x "/opt/bin/" ; then + USE_="USE_ = 1" + + =/opt/bin/ + + _BIN=/opt/bin + + _DIR=/opt + + if test -n "apr-1/apu.h" -a -d "/opt/include" -a -f "/opt/include/apr-1/apu.h" ; then + _INC=/opt/include + + fi + if test -n "libaprutil-1.so" -a -d "/opt/lib" -a -f "/opt/lib/libaprutil-1.so" ; then + _LIB=/opt/lib + + fi +fi + + if test -z "${checkval}" ; then + +if test -n "/" -a -d "/" -a -n "" -a -d "//bin" -a -x "//bin/" ; then + USE_="USE_ = 1" + + =//bin/ + + _BIN=//bin + + _DIR=/ + + if test -n "apr-1/apu.h" -a -d "//include" -a -f "//include/apr-1/apu.h" ; then + _INC=//include + + fi + if test -n "libaprutil-1.so" -a -d "//lib" -a -f "//lib/libaprutil-1.so" ; then + _LIB=//lib + + fi +fi + + if test -z "${checkval}" ; then + checkresult="no" + fi + fi + fi + fi + fi + echo "$as_me:$LINENO: result: $checkresult" >&5 +echo "${ECHO_T}$checkresult" >&6 + fi +fi + + HLVM_SO_CURRENT="0" HLVM_SO_REVISION="10" HLVM_SO_AGE="0" @@ -4424,7 +4691,8 @@ -for ac_header in apr-1/apr.h expat.h llvm/Module.h + +for ac_header in apr-1/apr.h apr-1/apu.h expat.h llvm/Module.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Wed May 10 01:18:26 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Wed, 10 May 2006 02:18:26 -0400 Subject: [hlvm-commits] r32 - hlvm/AST Message-ID: <200605100618.k4A6IQ2k030796@sneezy.swagora.com> Author: reid Date: 2006-05-10 02:18:25 -0400 (Wed, 10 May 2006) New Revision: 32 Log: Add the Location class. Added: hlvm/AST/Location.h Added: hlvm/AST/Location.h =================================================================== --- hlvm/AST/Location.h 2006-05-10 06:07:30 UTC (rev 31) +++ hlvm/AST/Location.h 2006-05-10 06:18:25 UTC (rev 32) @@ -0,0 +1,60 @@ +// +// Copyright (C) 2006 HLVM Group. All Rights Reserved. +// +// This program is open source software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License (GPL) as published by +// the Free Software Foundation; either version 2 of the License, or (at your +// option) any later version. You should have received a copy of the GPL in a +// file named COPYING that was included with this program; if not, you can +// obtain a copy of the license through the Internet at http://www.fsf.org/ +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +//////////////////////////////////////////////////////////////////////////////// +/// @file hlvm/AST/Location.h +/// @author Reid Spencer (original author) +/// @date 2006/05/04 +/// @since 0.1.0 +/// @brief Declares the class hlvm::AST::Location +//////////////////////////////////////////////////////////////////////////////// + +#ifndef HLVM_AST_LOCATION_H +#define HLVM_AST_LOCATION_H + +#include + +namespace hlvm { +namespace AST { + + /// This class is used to hold a source code location as a filename, line + /// number and column number. This is used for generating error messages and + /// for debugging support. + /// @brief Source location holder class. + class Location + { + /// @name Constructors + /// @{ + public: + Location(uint32_t line, uint32_t col, const std::string& fname) + : line_(line), col_(col), fname_(fname) {} + + /// @} + /// @name Accessors + /// @{ + public: + + /// @} + /// @name Data + /// @{ + protected: + uint32_t line_; ///< Line number of source location + uint32_t col_; ///< Column number of source location + std::string fname_; ///< File name of source location + /// @} + }; +} // AST +} // hlvm +#endif _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Wed May 10 01:20:53 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Wed, 10 May 2006 02:20:53 -0400 Subject: [hlvm-commits] r33 - hlvm/AST Message-ID: <200605100620.k4A6Krd3030813@sneezy.swagora.com> Author: reid Date: 2006-05-10 02:20:52 -0400 (Wed, 10 May 2006) New Revision: 33 Log: Incorporate Location into each node. Modified: hlvm/AST/Location.h hlvm/AST/Node.h Modified: hlvm/AST/Location.h =================================================================== --- hlvm/AST/Location.h 2006-05-10 06:18:25 UTC (rev 32) +++ hlvm/AST/Location.h 2006-05-10 06:20:52 UTC (rev 33) @@ -40,6 +40,7 @@ public: Location(uint32_t line, uint32_t col, const std::string& fname) : line_(line), col_(col), fname_(fname) {} + Location() : line_(0), col_(0), fname_("") {} /// @} /// @name Accessors Modified: hlvm/AST/Node.h =================================================================== --- hlvm/AST/Node.h 2006-05-10 06:18:25 UTC (rev 32) +++ hlvm/AST/Node.h 2006-05-10 06:20:52 UTC (rev 33) @@ -25,8 +25,8 @@ #define HLVM_AST_NODE_H #include +#include #include -#include /// This namespace is for all HLVM software. It ensures that HLVM software does /// not collide with any other software. Hopefully HLVM is not a namespace used @@ -229,6 +229,7 @@ Node* parent_; ///< The node that owns this node. std::vector kids_; ///< The vector of children nodes. std::string name_; ///< The name of this node. + Location loc_; ///< The source location corresponding to node. /// @} }; } // AST _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Wed May 10 17:16:43 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Wed, 10 May 2006 18:16:43 -0400 Subject: [hlvm-commits] r34 - in tools: . hlvm-xml2yaml hlvm-yaml2xml Message-ID: <200605102216.k4AMGhCa032225@sneezy.swagora.com> Author: reid Date: 2006-05-10 18:16:42 -0400 (Wed, 10 May 2006) New Revision: 34 Log: Add directories for the first two executables that will be offered in Release 0.1: xml2yaml and yaml2xml. These will be used to convert between Yaml and XML formats of the AST. This will prove construction of an AST. Added: tools/hlvm-xml2yaml/ tools/hlvm-xml2yaml/Makefile tools/hlvm-yaml2xml/ tools/hlvm-yaml2xml/Makefile Modified: tools/Makefile Modified: tools/Makefile =================================================================== --- tools/Makefile 2006-05-10 06:20:52 UTC (rev 33) +++ tools/Makefile 2006-05-10 22:16:42 UTC (rev 34) @@ -1,13 +1,6 @@ ##===- tools/Makefile --------------------------------------*- Makefile -*-===## -# -# Relative path to the top of the source tree. -# LEVEL=.. +DIRS=hlvm-yaml2xml hlvm-xml2yaml -# -# List all of the subdirectories that we will compile. -# -DIRS= - include $(LEVEL)/Makefile.hlvm Added: tools/hlvm-xml2yaml/Makefile =================================================================== --- tools/hlvm-xml2yaml/Makefile 2006-05-10 06:20:52 UTC (rev 33) +++ tools/hlvm-xml2yaml/Makefile 2006-05-10 22:16:42 UTC (rev 34) @@ -0,0 +1,6 @@ +##===- tools/hlvm-xml2yaml/Makefile ------------------------*- Makefile -*-===## + +LEVEL=../.. +DIRS= + +include $(LEVEL)/Makefile.hlvm Property changes on: tools/hlvm-xml2yaml/Makefile ___________________________________________________________________ Name: svn:executable + * Added: tools/hlvm-yaml2xml/Makefile =================================================================== --- tools/hlvm-yaml2xml/Makefile 2006-05-10 06:20:52 UTC (rev 33) +++ tools/hlvm-yaml2xml/Makefile 2006-05-10 22:16:42 UTC (rev 34) @@ -0,0 +1,6 @@ +##===- tools/hlvm-yaml2xml/Makefile ------------------------*- Makefile -*-===## + +LEVEL=../.. +DIRS= + +include $(LEVEL)/Makefile.hlvm Property changes on: tools/hlvm-yaml2xml/Makefile ___________________________________________________________________ Name: svn:executable + * _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Thu May 11 01:01:49 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Thu, 11 May 2006 02:01:49 -0400 Subject: [hlvm-commits] r35 - / autoconf autoconf/m4 Message-ID: <200605110601.k4B61nT1032691@sneezy.swagora.com> Author: reid Date: 2006-05-11 02:01:48 -0400 (Thu, 11 May 2006) New Revision: 35 Log: Fix the support for automatically finding packages with librarys and headers by rewriting FIND_PACKAGE once again as FIND_LIBRARY. Use this facility to find expat and Syck. Correct the invocation of FIND_LIBRARY for APR and APRU. Added: autoconf/m4/find_library.m4 Modified: autoconf/configure.ac configure Modified: autoconf/configure.ac =================================================================== --- autoconf/configure.ac 2006-05-10 22:16:42 UTC (rev 34) +++ autoconf/configure.ac 2006-05-11 06:01:48 UTC (rev 35) @@ -15,12 +15,6 @@ AC_PREFIX_DEFAULT([/usr/local/hlvm]) -dnl ************************************************************************** -dnl * Set the location of various third-party software packages -dnl ************************************************************************** -FIND_PACKAGE([apr],[apr-1/apr.h],[libapr-1.so],[],[Apache Portable Runtime]) -FIND_PACKAGE([apr-util],[apr-1/apu.h],[libaprutil-1.so],[],[Apache Portable Runtime Utilities]) - dnl ---------------------------------------------------------------------------- dnl -- Shared Object Versioning For libtool dnl -- @@ -305,6 +299,13 @@ dnl -- SECTION 4: Check For Needed Libraries dnl -- dnl ---------------------------------------------------------------------------- +HLVM_FIND_LIBRARY([apr],[apr-1/apr.h],[apr-1],[apr_allocator_alloc], + [Apache Portable Runtime]) +HLVM_FIND_LIBRARY([apru],[apr-1/apu.h],[aprutil-1],[apu_version], + [Apache Portable Runtime Utilities]) +HLVM_FIND_LIBRARY([expat],[expat.h],[expat],[XML_ParserCreate], + [expat XML Parser]) +HLVM_FIND_LIBRARY([syck],[syck.h],[syck],[syck_parse],[Syck Yaml Handler]) dnl -- Check for specific libraries we depend on. LDFLAGS="-L${HLVM_WITH_LLVM_OBJ}/lib/Debug -L${prefix}/lib -L/usr/local/lib ${LDFLAGS}" @@ -312,30 +313,13 @@ AC_CHECK_LIB(efence,malloc,, AC_MSG_ERROR(Electric Fence library is required: -lefence) ) fi -dnl AC_CACHE_VAL(hlvm_cv_lib_c_ok, -dnl [AC_CHECK_LIB(c,exit,, -dnl AC_MSG_ERROR(Standard C Library is required: -lc)) ]) -dnl AC_CACHE_VAL(hlvm_cv_lib_m_ok, -dnl [AC_CHECK_LIB(m,floor,, -dnl AC_MSG_ERROR(Standard Math Library is required: -lm)) ]) -if test "$HLVM_WITH_EXPAT" = "/usr" ; then -AC_CACHE_VAL(ac_cv_lib_expat_ok, - [AC_CHECK_LIB(expat,XML_Parse,, - AC_MSG_ERROR(expat Library is required: -lexpat)) ]) -else - if test -r "$HLVM_WITH_EXPAT/libexpat.la" ; then - LIBS="$HLVM_WITH_EXPAT/libexpat.la $LIBS" - else - AC_MSG_ERROR([Can't find libexpat.la]) - fi -fi dnl ---------------------------------------------------------------------------- dnl -- dnl -- SECTION 5: Check For Needed Header Files dnl -- dnl ---------------------------------------------------------------------------- -AC_CHECK_HEADERS([apr-1/apr.h apr-1/apu.h expat.h llvm/Module.h]) +AC_CHECK_HEADERS([expat_external.h llvm/Module.h syck_st.h]) dnl ---------------------------------------------------------------------------- dnl -- Added: autoconf/m4/find_library.m4 =================================================================== --- autoconf/m4/find_library.m4 2006-05-10 22:16:42 UTC (rev 34) +++ autoconf/m4/find_library.m4 2006-05-11 06:01:48 UTC (rev 35) @@ -0,0 +1,153 @@ +dnl Avoid duplicating INCLUDE and LDFLAG settings with this macro +dnl Parameters: +dnl $1 - Variable to set +dnl $2 - Value to add, if not present +AC_DEFUN([HLVM_ADD_TO_VAR],[ + echo ["$]$1["] | grep -- "$2" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + $1=["$]$1[ ]$2["] + fi +]) +dnl Check for a package and its libraries and include files +dnl +dnl Parameters: +dnl $1 - prefix directory to check +dnl $2 - package name +dnl $3 - header file to check +AC_DEFUN([HLVM_CHECK_INCLUDE],[ +hlvm_found_inc=0 +if test -d "$1" ; then + if test -n "$3" ; then + for dir in "$1/include" "$1" "$1/include/$2" ; do + if test -d "$dir" ; then + if test -f "$dir/$3" ; then + AC_SUBST($2[_INC],["$dir"]) + hlvm_found_inc=1 + fi + fi + done + fi +fi +]) +dnl Parameters: +dnl $1 - prefix directory to check +dnl $2 - package name +dnl $3 - library file to check +AC_DEFUN([HLVM_CHECK_LIBRARY],[ +hlvm_found_lib=0 +if test -d "$1" ; then + if test -n "$3" ; then + for dir in "$1" "$1/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/lib$3.so" ; then + AC_SUBST($2[_LIB],[$dir]) + hlvm_found_lib=1 + elif test -f "$dir/lib$3.a" ; then + AC_SUBST($2[_LIB],[$dir]) + hlvm_found_lib=1 + elif test -f "$dir/lib$3.la" ; then + AC_SUBST($2[_LIB],[$dir]) + hlvm_found_lib=1 + fi + fi + done + fi +fi +]) + +dnl Find a program via --with options, in the path, or well known places +dnl +dnl Parameters: +dnl $1 - short name for the package +dnl $2 - header file name to check (optional) +dnl $3 - library file name to check (optional) +dnl $4 - library symbol to test +dnl $5 - alternate (long) name for the program +AC_DEFUN([HLVM_FIND_LIBRARY], +[m4_define([allcapsname],translit($1,a-z,A-Z)) +AC_ARG_WITH(allcapsname(), + AS_HELP_STRING([--with-]allcapsname()[=DIR], + [Specify that the ]$5[ install prefix is DIR]), + $1[pfxdir=$withval],$1[pfxdir=nada]) +AC_ARG_WITH(allcapsname()[-lib], + AS_HELP_STRING([--with-]allcapsname()[-lib=DIR], + [Specify that ]$5[ libraries are in DIR]), + $1[libdir=$withval],$1[libdir=nada]) +AC_ARG_WITH(allcapsname()[-inc], + AS_HELP_STRING([--with-]allcapsname()[-inc=DIR], + [Specify that the ]$5[ includes are in DIR]), + $1[incdir=$withval],$1[incdir=nada]) +pfxval="${]$1[pfxdir}" +incval="${]$1[incdir}" +libval="${]$1[libdir}" +AC_MSG_CHECKING([for ]$5[ library and header]) +hlvm_found_lib=0 +hlvm_found_inc=0 +if test "${pfxval}" != "nada" ; then + if test -d "${pfxval}" ; then + HLVM_CHECK_INCLUDE(${pfxval},$1,$2) + HLVM_CHECK_LIBRARY(${pfxval},$1,$3) + else + AC_MSG_RESULT([failed]); + AC_MSG_ERROR([The --with-]$1[ value must be a directory]) + fi +else + if test "${libval}" != "nada" ; then + HLVM_CHECK_LIBRARY(${libval},$1,$3) + fi + if test "${incval}" != "nada" ; then + HLVM_CHECK_INCLUDE(${incval},$1,$2) + fi +fi +if test "$hlvm_found_lib" != 1 ; then + HLVM_CHECK_LIBRARY([/usr],$1,$3) +fi +if test "$hlvm_found_lib" != 1 ; then + HLVM_CHECK_LIBRARY([/usr/local],$1,$3) +fi +if test "$hlvm_found_lib" != 1 ; then + HLVM_CHECK_LIBRARY([/proj/install],$1,$3) +fi +if test "$hlvm_found_lib" != 1 ; then + HLVM_CHECK_LIBRARY([/sw],$1,$3) +fi +if test "$hlvm_found_lib" != 1 ; then + HLVM_CHECK_LIBRARY([/opt],$1,$3) +fi +if test "$hlvm_found_inc" != 1 ; then + HLVM_CHECK_INCLUDE([/usr],$1,$2) +fi +if test "$hlvm_found_inc" != 1 ; then + HLVM_CHECK_INCLUDE([/usr/local],$1,$2) +fi +if test "$hlvm_found_inc" != 1 ; then + HLVM_CHECK_INCLUDE([/proj/install],$1,$2) +fi +if test "$hlvm_found_inc" != 1 ; then + HLVM_CHECK_INCLUDE([/sw],$1,$2) +fi +if test "$hlvm_found_inc" != 1 ; then + HLVM_CHECK_INCLUDE([/opt],$1,$2) +fi +if test "$hlvm_found_inc" == 1 ; then + if test "$hlvm_found_lib" == 1 ; then + AC_MSG_RESULT([found]) + incdir=[${]$1[_INC}] + libdir=[${]$1[_LIB}] + HLVM_ADD_TO_VAR(LDFLAGS,-L"${libdir}") + AC_SEARCH_LIBS($4,$3,[found_sym=1],[found_sym=0]) + if test "$found_sym" == "1" ; then + AC_MSG_NOTICE([Found $1 in ${incdir} and ${libdir}]) + HLVM_ADD_TO_VAR(CPPFLAGS,-I"${incdir}") + else + AC_MSG_NOTICE([Symbol ']$4[' not found in library $3 in ${libdir}]) + fi + else + AC_MSG_RESULT([failed to find library file]) + AC_MSG_ERROR([The --with-]$1[-libdir option must be used]) + fi +else + AC_MSG_RESULT([failed to find header file]) + AC_MSG_ERROR([The --with-]$1[-incdir option must be used]) +fi +]) Modified: configure =================================================================== --- configure 2006-05-10 22:16:42 UTC (rev 34) +++ configure 2006-05-11 06:01:48 UTC (rev 35) @@ -315,7 +315,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS HLVM_COPYRIGHT HLVM_PACKAGE HLVM_VERSION USE_ _BIN _DIR _INC _LIB HLVM_SO_VERSION HLVM_SO_CURRENT HLVM_SO_REVISION HLVM_SO_AGE HLVM_SHAREDPREFIX HLVM_DEBUG HLVM_OPTIMIZE HLVM_INLINE HLVM_ASSERT HLVM_TRACE HLVM_SMALL HLVM_EFENCE HLVM_PROFILING HLVM_WITH_WORKSPACE HLVM_WITH_EXPAT HLVM_WITH_INCLUDES HLVM_WITH_LLVM_SRC HLVM_WITH_LLVM_OBJ HLVM_WITH_LLVMGCC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX ifGNUmake EGREP HLVM_CFGNAME HLVM_CONFIGTIME HLVM_PREFIX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS HLVM_COPYRIGHT HLVM_PACKAGE HLVM_VERSION HLVM_SO_VERSION HLVM_SO_CURRENT HLVM_SO_REVISION HLVM_SO_AGE HLVM_SHAREDPREFIX HLVM_DEBUG HLVM_OPTIMIZE HLVM_INLINE HLVM_ASSERT HLVM_TRACE HLVM_SMALL HLVM_EFENCE HLVM_PROFILING HLVM_WITH_WORKSPACE HLVM_WITH_EXPAT HLVM_WITH_INCLUDES HLVM_WITH_LLVM_SRC HLVM_WITH_LLVM_OBJ HLVM_WITH_LLVMGCC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX ifGNUmake apr_INC apr_LIB apru_INC apru_LIB expat_INC expat_LIB syck_INC syck_LIB EGREP HLVM_CFGNAME HLVM_CONFIGTIME HLVM_PREFIX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -873,22 +873,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-APR=DIR Specify that the Apache Portable Runtime install - prefix is DIR - --with-APR-bin=DIR Specify that the Apache Portable Runtime binary is - in DIR - --with-APR-lib=DIR Specify that Apache Portable Runtime libraries are - in DIR - --with-APR-inc=DIR Specify that the Apache Portable Runtime includes - are in DIR - --with-APR-UTIL=DIR Specify that the Apache Portable Runtime Utilities - install prefix is DIR - --with-APR-UTIL-bin=DIR Specify that the Apache Portable Runtime Utilities - binary is in DIR - --with-APR-UTIL-lib=DIR Specify that Apache Portable Runtime Utilities - libraries are in DIR - --with-APR-UTIL-inc=DIR Specify that the Apache Portable Runtime Utilities - includes are in DIR --with-workspace= dir=location of the HLVM workspace storage (default=/opt/hlvm) --with-expat= Specify where the expat lbrary is located @@ -901,6 +885,28 @@ (default=/usr) --with-llvm-gcc= dir=the location of LLVM's llvm-gcc compiler (default=use normal gcc) + --with-APR=DIR Specify that the Apache Portable Runtime install + prefix is DIR + --with-APR-lib=DIR Specify that Apache Portable Runtime libraries are + in DIR + --with-APR-inc=DIR Specify that the Apache Portable Runtime includes + are in DIR + --with-APRU=DIR Specify that the Apache Portable Runtime Utilities + install prefix is DIR + --with-APRU-lib=DIR Specify that Apache Portable Runtime Utilities + libraries are in DIR + --with-APRU-inc=DIR Specify that the Apache Portable Runtime Utilities + includes are in DIR + --with-EXPAT=DIR Specify that the expat XML Parser install prefix is + DIR + --with-EXPAT-lib=DIR Specify that expat XML Parser libraries are in DIR + --with-EXPAT-inc=DIR Specify that the expat XML Parser includes are in + DIR + --with-SYCK=DIR Specify that the Syck Yaml Handler install prefix is + DIR + --with-SYCK-lib=DIR Specify that Syck Yaml Handler libraries are in DIR + --with-SYCK-inc=DIR Specify that the Syck Yaml Handler includes are in + DIR Some influential environment variables: CC C compiler command @@ -1378,525 +1384,6 @@ - -echo "$as_me:$LINENO: checking for Apache Portable Runtime bin/lib/include locations" >&5 -echo $ECHO_N "checking for Apache Portable Runtime bin/lib/include locations... $ECHO_C" >&6 - -# Check whether --with-APR or --without-APR was given. -if test "${with_APR+set}" = set; then - withval="$with_APR" - aprpfxdir=$withval -else - aprpfxdir=nada -fi; - -# Check whether --with-APR-bin or --without-APR-bin was given. -if test "${with_APR_bin+set}" = set; then - withval="$with_APR_bin" - aprbindir=$withval -else - aprbindir=nada -fi; - -# Check whether --with-APR-lib or --without-APR-lib was given. -if test "${with_APR_lib+set}" = set; then - withval="$with_APR_lib" - aprlibdir=$withval -else - aprlibdir=nada -fi; - -# Check whether --with-APR-inc or --without-APR-inc was given. -if test "${with_APR_inc+set}" = set; then - withval="$with_APR_inc" - aprincdir=$withval -else - aprincdir=nada -fi; -eval pfxval=\$\{aprpfxdir\} -eval binval=\$\{aprbindir\} -eval incval=\$\{aprincdir\} -eval libvar=\$\{aprlibdir\} -if test "${pfxval}" != "nada" ; then - -if test -n "${pfxval}" -a -d "${pfxval}" -a -n "" -a -d "${pfxval}/bin" -a -x "${pfxval}/bin/" ; then - USE_="USE_ = 1" - - =${pfxval}/bin/ - - _BIN=${pfxval}/bin - - _DIR=${pfxval} - - if test -n "apr-1/apr.h" -a -d "${pfxval}/include" -a -f "${pfxval}/include/apr-1/apr.h" ; then - _INC=${pfxval}/include - - fi - if test -n "libapr-1.so" -a -d "${pfxval}/lib" -a -f "${pfxval}/lib/libapr-1.so" ; then - _LIB=${pfxval}/lib - - fi -fi - -elif test "${binval}" != "nada" ; then - if test "${libval}" != "nada" ; then - if test "${incval}" != "nada" ; then - if test -d "${binval}" ; then - if test -d "${incval}" ; then - if test -d "${libval}" ; then - =${binval}/apr - - _BIN=${binval} - - _INC=${incval} - - _LIB=${libval} - - USE_=1 - - echo "$as_me:$LINENO: result: found via --with options" >&5 -echo "${ECHO_T}found via --with options" >&6 - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-libdir value must be a directory" >&5 -echo "$as_me: error: The --with-apr-libdir value must be a directory" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-incdir value must be a directory" >&5 -echo "$as_me: error: The --with-apr-incdir value must be a directory" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-bindir value must be a directory" >&5 -echo "$as_me: error: The --with-apr-bindir value must be a directory" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-incdir option must be specified" >&5 -echo "$as_me: error: The --with-apr-incdir option must be specified" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-libdir option must be specified" >&5 -echo "$as_me: error: The --with-apr-libdir option must be specified" >&2;} - { (exit 1); exit 1; }; } - fi -else - tmppfxdir=`which apr 2>&1` - if test -n "$tmppfxdir" -a -d "${tmppfxdir%*apr}" -a \ - -d "${tmppfxdir%*apr}/.." ; then - tmppfxdir=`cd "${tmppfxdir%*apr}/.." ; pwd` - -if test -n "$tmppfxdir" -a -d "$tmppfxdir" -a -n "" -a -d "$tmppfxdir/bin" -a -x "$tmppfxdir/bin/" ; then - USE_="USE_ = 1" - - =$tmppfxdir/bin/ - - _BIN=$tmppfxdir/bin - - _DIR=$tmppfxdir - - if test -n "apr-1/apr.h" -a -d "$tmppfxdir/include" -a -f "$tmppfxdir/include/apr-1/apr.h" ; then - _INC=$tmppfxdir/include - - fi - if test -n "libapr-1.so" -a -d "$tmppfxdir/lib" -a -f "$tmppfxdir/lib/libapr-1.so" ; then - _LIB=$tmppfxdir/lib - - fi -fi - - echo "$as_me:$LINENO: result: found in PATH at $tmppfxdir" >&5 -echo "${ECHO_T}found in PATH at $tmppfxdir" >&6 - else - checkresult="yes" - eval checkval=\$\{"USE_"\} - -if test -n "/usr" -a -d "/usr" -a -n "" -a -d "/usr/bin" -a -x "/usr/bin/" ; then - USE_="USE_ = 1" - - =/usr/bin/ - - _BIN=/usr/bin - - _DIR=/usr - - if test -n "apr-1/apr.h" -a -d "/usr/include" -a -f "/usr/include/apr-1/apr.h" ; then - _INC=/usr/include - - fi - if test -n "libapr-1.so" -a -d "/usr/lib" -a -f "/usr/lib/libapr-1.so" ; then - _LIB=/usr/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/usr/local" -a -d "/usr/local" -a -n "" -a -d "/usr/local/bin" -a -x "/usr/local/bin/" ; then - USE_="USE_ = 1" - - =/usr/local/bin/ - - _BIN=/usr/local/bin - - _DIR=/usr/local - - if test -n "apr-1/apr.h" -a -d "/usr/local/include" -a -f "/usr/local/include/apr-1/apr.h" ; then - _INC=/usr/local/include - - fi - if test -n "libapr-1.so" -a -d "/usr/local/lib" -a -f "/usr/local/lib/libapr-1.so" ; then - _LIB=/usr/local/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/sw" -a -d "/sw" -a -n "" -a -d "/sw/bin" -a -x "/sw/bin/" ; then - USE_="USE_ = 1" - - =/sw/bin/ - - _BIN=/sw/bin - - _DIR=/sw - - if test -n "apr-1/apr.h" -a -d "/sw/include" -a -f "/sw/include/apr-1/apr.h" ; then - _INC=/sw/include - - fi - if test -n "libapr-1.so" -a -d "/sw/lib" -a -f "/sw/lib/libapr-1.so" ; then - _LIB=/sw/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/opt" -a -d "/opt" -a -n "" -a -d "/opt/bin" -a -x "/opt/bin/" ; then - USE_="USE_ = 1" - - =/opt/bin/ - - _BIN=/opt/bin - - _DIR=/opt - - if test -n "apr-1/apr.h" -a -d "/opt/include" -a -f "/opt/include/apr-1/apr.h" ; then - _INC=/opt/include - - fi - if test -n "libapr-1.so" -a -d "/opt/lib" -a -f "/opt/lib/libapr-1.so" ; then - _LIB=/opt/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/" -a -d "/" -a -n "" -a -d "//bin" -a -x "//bin/" ; then - USE_="USE_ = 1" - - =//bin/ - - _BIN=//bin - - _DIR=/ - - if test -n "apr-1/apr.h" -a -d "//include" -a -f "//include/apr-1/apr.h" ; then - _INC=//include - - fi - if test -n "libapr-1.so" -a -d "//lib" -a -f "//lib/libapr-1.so" ; then - _LIB=//lib - - fi -fi - - if test -z "${checkval}" ; then - checkresult="no" - fi - fi - fi - fi - fi - echo "$as_me:$LINENO: result: $checkresult" >&5 -echo "${ECHO_T}$checkresult" >&6 - fi -fi - - -echo "$as_me:$LINENO: checking for Apache Portable Runtime Utilities bin/lib/include locations" >&5 -echo $ECHO_N "checking for Apache Portable Runtime Utilities bin/lib/include locations... $ECHO_C" >&6 - -# Check whether --with-APR-UTIL or --without-APR-UTIL was given. -if test "${with_APR_UTIL+set}" = set; then - withval="$with_APR_UTIL" - apr-utilpfxdir=$withval -else - apr-utilpfxdir=nada -fi; - -# Check whether --with-APR-UTIL-bin or --without-APR-UTIL-bin was given. -if test "${with_APR_UTIL_bin+set}" = set; then - withval="$with_APR_UTIL_bin" - apr-utilbindir=$withval -else - apr-utilbindir=nada -fi; - -# Check whether --with-APR-UTIL-lib or --without-APR-UTIL-lib was given. -if test "${with_APR_UTIL_lib+set}" = set; then - withval="$with_APR_UTIL_lib" - apr-utillibdir=$withval -else - apr-utillibdir=nada -fi; - -# Check whether --with-APR-UTIL-inc or --without-APR-UTIL-inc was given. -if test "${with_APR_UTIL_inc+set}" = set; then - withval="$with_APR_UTIL_inc" - apr-utilincdir=$withval -else - apr-utilincdir=nada -fi; -eval pfxval=\$\{apr-utilpfxdir\} -eval binval=\$\{apr-utilbindir\} -eval incval=\$\{apr-utilincdir\} -eval libvar=\$\{apr-utillibdir\} -if test "${pfxval}" != "nada" ; then - -if test -n "${pfxval}" -a -d "${pfxval}" -a -n "" -a -d "${pfxval}/bin" -a -x "${pfxval}/bin/" ; then - USE_="USE_ = 1" - - =${pfxval}/bin/ - - _BIN=${pfxval}/bin - - _DIR=${pfxval} - - if test -n "apr-1/apu.h" -a -d "${pfxval}/include" -a -f "${pfxval}/include/apr-1/apu.h" ; then - _INC=${pfxval}/include - - fi - if test -n "libaprutil-1.so" -a -d "${pfxval}/lib" -a -f "${pfxval}/lib/libaprutil-1.so" ; then - _LIB=${pfxval}/lib - - fi -fi - -elif test "${binval}" != "nada" ; then - if test "${libval}" != "nada" ; then - if test "${incval}" != "nada" ; then - if test -d "${binval}" ; then - if test -d "${incval}" ; then - if test -d "${libval}" ; then - =${binval}/apr-util - - _BIN=${binval} - - _INC=${incval} - - _LIB=${libval} - - USE_=1 - - echo "$as_me:$LINENO: result: found via --with options" >&5 -echo "${ECHO_T}found via --with options" >&6 - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-util-libdir value must be a directory" >&5 -echo "$as_me: error: The --with-apr-util-libdir value must be a directory" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-util-incdir value must be a directory" >&5 -echo "$as_me: error: The --with-apr-util-incdir value must be a directory" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-util-bindir value must be a directory" >&5 -echo "$as_me: error: The --with-apr-util-bindir value must be a directory" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-util-incdir option must be specified" >&5 -echo "$as_me: error: The --with-apr-util-incdir option must be specified" >&2;} - { (exit 1); exit 1; }; } - fi - else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: The --with-apr-util-libdir option must be specified" >&5 -echo "$as_me: error: The --with-apr-util-libdir option must be specified" >&2;} - { (exit 1); exit 1; }; } - fi -else - tmppfxdir=`which apr-util 2>&1` - if test -n "$tmppfxdir" -a -d "${tmppfxdir%*apr-util}" -a \ - -d "${tmppfxdir%*apr-util}/.." ; then - tmppfxdir=`cd "${tmppfxdir%*apr-util}/.." ; pwd` - -if test -n "$tmppfxdir" -a -d "$tmppfxdir" -a -n "" -a -d "$tmppfxdir/bin" -a -x "$tmppfxdir/bin/" ; then - USE_="USE_ = 1" - - =$tmppfxdir/bin/ - - _BIN=$tmppfxdir/bin - - _DIR=$tmppfxdir - - if test -n "apr-1/apu.h" -a -d "$tmppfxdir/include" -a -f "$tmppfxdir/include/apr-1/apu.h" ; then - _INC=$tmppfxdir/include - - fi - if test -n "libaprutil-1.so" -a -d "$tmppfxdir/lib" -a -f "$tmppfxdir/lib/libaprutil-1.so" ; then - _LIB=$tmppfxdir/lib - - fi -fi - - echo "$as_me:$LINENO: result: found in PATH at $tmppfxdir" >&5 -echo "${ECHO_T}found in PATH at $tmppfxdir" >&6 - else - checkresult="yes" - eval checkval=\$\{"USE_"\} - -if test -n "/usr" -a -d "/usr" -a -n "" -a -d "/usr/bin" -a -x "/usr/bin/" ; then - USE_="USE_ = 1" - - =/usr/bin/ - - _BIN=/usr/bin - - _DIR=/usr - - if test -n "apr-1/apu.h" -a -d "/usr/include" -a -f "/usr/include/apr-1/apu.h" ; then - _INC=/usr/include - - fi - if test -n "libaprutil-1.so" -a -d "/usr/lib" -a -f "/usr/lib/libaprutil-1.so" ; then - _LIB=/usr/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/usr/local" -a -d "/usr/local" -a -n "" -a -d "/usr/local/bin" -a -x "/usr/local/bin/" ; then - USE_="USE_ = 1" - - =/usr/local/bin/ - - _BIN=/usr/local/bin - - _DIR=/usr/local - - if test -n "apr-1/apu.h" -a -d "/usr/local/include" -a -f "/usr/local/include/apr-1/apu.h" ; then - _INC=/usr/local/include - - fi - if test -n "libaprutil-1.so" -a -d "/usr/local/lib" -a -f "/usr/local/lib/libaprutil-1.so" ; then - _LIB=/usr/local/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/sw" -a -d "/sw" -a -n "" -a -d "/sw/bin" -a -x "/sw/bin/" ; then - USE_="USE_ = 1" - - =/sw/bin/ - - _BIN=/sw/bin - - _DIR=/sw - - if test -n "apr-1/apu.h" -a -d "/sw/include" -a -f "/sw/include/apr-1/apu.h" ; then - _INC=/sw/include - - fi - if test -n "libaprutil-1.so" -a -d "/sw/lib" -a -f "/sw/lib/libaprutil-1.so" ; then - _LIB=/sw/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/opt" -a -d "/opt" -a -n "" -a -d "/opt/bin" -a -x "/opt/bin/" ; then - USE_="USE_ = 1" - - =/opt/bin/ - - _BIN=/opt/bin - - _DIR=/opt - - if test -n "apr-1/apu.h" -a -d "/opt/include" -a -f "/opt/include/apr-1/apu.h" ; then - _INC=/opt/include - - fi - if test -n "libaprutil-1.so" -a -d "/opt/lib" -a -f "/opt/lib/libaprutil-1.so" ; then - _LIB=/opt/lib - - fi -fi - - if test -z "${checkval}" ; then - -if test -n "/" -a -d "/" -a -n "" -a -d "//bin" -a -x "//bin/" ; then - USE_="USE_ = 1" - - =//bin/ - - _BIN=//bin - - _DIR=/ - - if test -n "apr-1/apu.h" -a -d "//include" -a -f "//include/apr-1/apu.h" ; then - _INC=//include - - fi - if test -n "libaprutil-1.so" -a -d "//lib" -a -f "//lib/libaprutil-1.so" ; then - _LIB=//lib - - fi -fi - - if test -z "${checkval}" ; then - checkresult="no" - fi - fi - fi - fi - fi - echo "$as_me:$LINENO: result: $checkresult" >&5 -echo "${ECHO_T}$checkresult" >&6 - fi -fi - - HLVM_SO_CURRENT="0" HLVM_SO_REVISION="10" HLVM_SO_AGE="0" @@ -4258,17 +3745,372 @@ -LDFLAGS="-L${HLVM_WITH_LLVM_OBJ}/lib/Debug -L${prefix}/lib -L/usr/local/lib ${LDFLAGS}" -if test "$HLVM_EFENCE" = true ; then -echo "$as_me:$LINENO: checking for malloc in -lefence" >&5 -echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6 -if test "${ac_cv_lib_efence_malloc+set}" = set; then +# Check whether --with-APR or --without-APR was given. +if test "${with_APR+set}" = set; then + withval="$with_APR" + aprpfxdir=$withval +else + aprpfxdir=nada +fi; + +# Check whether --with-APR-lib or --without-APR-lib was given. +if test "${with_APR_lib+set}" = set; then + withval="$with_APR_lib" + aprlibdir=$withval +else + aprlibdir=nada +fi; + +# Check whether --with-APR-inc or --without-APR-inc was given. +if test "${with_APR_inc+set}" = set; then + withval="$with_APR_inc" + aprincdir=$withval +else + aprincdir=nada +fi; +pfxval="${aprpfxdir}" +incval="${aprincdir}" +libval="${aprlibdir}" +echo "$as_me:$LINENO: checking for Apache Portable Runtime library and header" >&5 +echo $ECHO_N "checking for Apache Portable Runtime library and header... $ECHO_C" >&6 +hlvm_found_lib=0 +hlvm_found_inc=0 +if test "${pfxval}" != "nada" ; then + if test -d "${pfxval}" ; then + +hlvm_found_inc=0 +if test -d "${pfxval}" ; then + if test -n "apr-1/apr.h" ; then + for dir in "${pfxval}/include" "${pfxval}" "${pfxval}/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + + +hlvm_found_lib=0 +if test -d "${pfxval}" ; then + if test -n "apr-1" ; then + for dir in "${pfxval}" "${pfxval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; + { { echo "$as_me:$LINENO: error: The --with-apr value must be a directory" >&5 +echo "$as_me: error: The --with-apr value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi +else + if test "${libval}" != "nada" ; then + +hlvm_found_lib=0 +if test -d "${libval}" ; then + if test -n "apr-1" ; then + for dir in "${libval}" "${libval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + fi + if test "${incval}" != "nada" ; then + +hlvm_found_inc=0 +if test -d "${incval}" ; then + if test -n "apr-1/apr.h" ; then + for dir in "${incval}/include" "${incval}" "${incval}/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + + fi +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr" ; then + if test -n "apr-1" ; then + for dir in "/usr" "/usr/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr/local" ; then + if test -n "apr-1" ; then + for dir in "/usr/local" "/usr/local/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/proj/install" ; then + if test -n "apr-1" ; then + for dir in "/proj/install" "/proj/install/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/sw" ; then + if test -n "apr-1" ; then + for dir in "/sw" "/sw/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/opt" ; then + if test -n "apr-1" ; then + for dir in "/opt" "/opt/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libapr-1.so" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.a" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libapr-1.la" ; then + apr_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr" ; then + if test -n "apr-1/apr.h" ; then + for dir in "/usr/include" "/usr" "/usr/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr/local" ; then + if test -n "apr-1/apr.h" ; then + for dir in "/usr/local/include" "/usr/local" "/usr/local/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/proj/install" ; then + if test -n "apr-1/apr.h" ; then + for dir in "/proj/install/include" "/proj/install" "/proj/install/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/sw" ; then + if test -n "apr-1/apr.h" ; then + for dir in "/sw/include" "/sw" "/sw/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/opt" ; then + if test -n "apr-1/apr.h" ; then + for dir in "/opt/include" "/opt" "/opt/include/apr" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apr.h" ; then + apr_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" == 1 ; then + if test "$hlvm_found_lib" == 1 ; then + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + incdir=${apr_INC} + libdir=${apr_LIB} + + echo "$LDFLAGS" | grep -- "-L"${libdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + LDFLAGS="$LDFLAGS -L"${libdir}"" + fi + + echo "$as_me:$LINENO: checking for library containing apr_allocator_alloc" >&5 +echo $ECHO_N "checking for library containing apr_allocator_alloc... $ECHO_C" >&6 +if test "${ac_cv_search_apr_allocator_alloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lefence $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_apr_allocator_alloc=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4282,11 +4124,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char malloc (); +char apr_allocator_alloc (); int main () { -malloc (); +apr_allocator_alloc (); ; return 0; } @@ -4313,45 +4155,477 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_efence_malloc=yes + ac_cv_search_apr_allocator_alloc="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_efence_malloc=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6 -if test $ac_cv_lib_efence_malloc = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBEFENCE 1 +if test "$ac_cv_search_apr_allocator_alloc" = no; then + for ac_lib in apr-1; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - LIBS="-lefence $LIBS" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char apr_allocator_alloc (); +int +main () +{ +apr_allocator_alloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_apr_allocator_alloc="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_apr_allocator_alloc" >&5 +echo "${ECHO_T}$ac_cv_search_apr_allocator_alloc" >&6 +if test "$ac_cv_search_apr_allocator_alloc" != no; then + test "$ac_cv_search_apr_allocator_alloc" = "none required" || LIBS="$ac_cv_search_apr_allocator_alloc $LIBS" + found_sym=1 else - { { echo "$as_me:$LINENO: error: Electric Fence library is required: -lefence" >&5 -echo "$as_me: error: Electric Fence library is required: -lefence" >&2;} + found_sym=0 +fi + + if test "$found_sym" == "1" ; then + { echo "$as_me:$LINENO: Found apr in ${incdir} and ${libdir}" >&5 +echo "$as_me: Found apr in ${incdir} and ${libdir}" >&6;} + + echo "$CPPFLAGS" | grep -- "-I"${incdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + CPPFLAGS="$CPPFLAGS -I"${incdir}"" + fi + + else + { echo "$as_me:$LINENO: Symbol 'apr_allocator_alloc' not found in library apr-1 in ${libdir}" >&5 +echo "$as_me: Symbol 'apr_allocator_alloc' not found in library apr-1 in ${libdir}" >&6;} + fi + else + echo "$as_me:$LINENO: result: failed to find library file" >&5 +echo "${ECHO_T}failed to find library file" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-libdir option must be used" >&5 +echo "$as_me: error: The --with-apr-libdir option must be used" >&2;} { (exit 1); exit 1; }; } + fi +else + echo "$as_me:$LINENO: result: failed to find header file" >&5 +echo "${ECHO_T}failed to find header file" >&6 + { { echo "$as_me:$LINENO: error: The --with-apr-incdir option must be used" >&5 +echo "$as_me: error: The --with-apr-incdir option must be used" >&2;} + { (exit 1); exit 1; }; } fi + + +# Check whether --with-APRU or --without-APRU was given. +if test "${with_APRU+set}" = set; then + withval="$with_APRU" + aprupfxdir=$withval +else + aprupfxdir=nada +fi; + +# Check whether --with-APRU-lib or --without-APRU-lib was given. +if test "${with_APRU_lib+set}" = set; then + withval="$with_APRU_lib" + aprulibdir=$withval +else + aprulibdir=nada +fi; + +# Check whether --with-APRU-inc or --without-APRU-inc was given. +if test "${with_APRU_inc+set}" = set; then + withval="$with_APRU_inc" + apruincdir=$withval +else + apruincdir=nada +fi; +pfxval="${aprupfxdir}" +incval="${apruincdir}" +libval="${aprulibdir}" +echo "$as_me:$LINENO: checking for Apache Portable Runtime Utilities library and header" >&5 +echo $ECHO_N "checking for Apache Portable Runtime Utilities library and header... $ECHO_C" >&6 +hlvm_found_lib=0 +hlvm_found_inc=0 +if test "${pfxval}" != "nada" ; then + if test -d "${pfxval}" ; then + +hlvm_found_inc=0 +if test -d "${pfxval}" ; then + if test -n "apr-1/apu.h" ; then + for dir in "${pfxval}/include" "${pfxval}" "${pfxval}/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi fi -if test "$HLVM_WITH_EXPAT" = "/usr" ; then -if test "${ac_cv_lib_expat_ok+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + +hlvm_found_lib=0 +if test -d "${pfxval}" ; then + if test -n "aprutil-1" ; then + for dir in "${pfxval}" "${pfxval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; + { { echo "$as_me:$LINENO: error: The --with-apru value must be a directory" >&5 +echo "$as_me: error: The --with-apru value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi else + if test "${libval}" != "nada" ; then -echo "$as_me:$LINENO: checking for XML_Parse in -lexpat" >&5 -echo $ECHO_N "checking for XML_Parse in -lexpat... $ECHO_C" >&6 -if test "${ac_cv_lib_expat_XML_Parse+set}" = set; then +hlvm_found_lib=0 +if test -d "${libval}" ; then + if test -n "aprutil-1" ; then + for dir in "${libval}" "${libval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + fi + if test "${incval}" != "nada" ; then + +hlvm_found_inc=0 +if test -d "${incval}" ; then + if test -n "apr-1/apu.h" ; then + for dir in "${incval}/include" "${incval}" "${incval}/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + + fi +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr" ; then + if test -n "aprutil-1" ; then + for dir in "/usr" "/usr/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr/local" ; then + if test -n "aprutil-1" ; then + for dir in "/usr/local" "/usr/local/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/proj/install" ; then + if test -n "aprutil-1" ; then + for dir in "/proj/install" "/proj/install/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/sw" ; then + if test -n "aprutil-1" ; then + for dir in "/sw" "/sw/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/opt" ; then + if test -n "aprutil-1" ; then + for dir in "/opt" "/opt/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libaprutil-1.so" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.a" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libaprutil-1.la" ; then + apru_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr" ; then + if test -n "apr-1/apu.h" ; then + for dir in "/usr/include" "/usr" "/usr/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr/local" ; then + if test -n "apr-1/apu.h" ; then + for dir in "/usr/local/include" "/usr/local" "/usr/local/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/proj/install" ; then + if test -n "apr-1/apu.h" ; then + for dir in "/proj/install/include" "/proj/install" "/proj/install/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/sw" ; then + if test -n "apr-1/apu.h" ; then + for dir in "/sw/include" "/sw" "/sw/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/opt" ; then + if test -n "apr-1/apu.h" ; then + for dir in "/opt/include" "/opt" "/opt/include/apru" ; do + if test -d "$dir" ; then + if test -f "$dir/apr-1/apu.h" ; then + apru_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" == 1 ; then + if test "$hlvm_found_lib" == 1 ; then + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + incdir=${apru_INC} + libdir=${apru_LIB} + + echo "$LDFLAGS" | grep -- "-L"${libdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + LDFLAGS="$LDFLAGS -L"${libdir}"" + fi + + echo "$as_me:$LINENO: checking for library containing apu_version" >&5 +echo $ECHO_N "checking for library containing apu_version... $ECHO_C" >&6 +if test "${ac_cv_search_apu_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lexpat $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_apu_version=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4365,11 +4639,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XML_Parse (); +char apu_version (); int main () { -XML_Parse (); +apu_version (); ; return 0; } @@ -4396,45 +4670,1225 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_expat_XML_Parse=yes + ac_cv_search_apu_version="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_expat_XML_Parse=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if test "$ac_cv_search_apu_version" = no; then + for ac_lib in aprutil-1; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char apu_version (); +int +main () +{ +apu_version (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_apu_version="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_Parse" >&5 -echo "${ECHO_T}$ac_cv_lib_expat_XML_Parse" >&6 -if test $ac_cv_lib_expat_XML_Parse = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBEXPAT 1 +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_apu_version" >&5 +echo "${ECHO_T}$ac_cv_search_apu_version" >&6 +if test "$ac_cv_search_apu_version" != no; then + test "$ac_cv_search_apu_version" = "none required" || LIBS="$ac_cv_search_apu_version $LIBS" + found_sym=1 +else + found_sym=0 +fi + + if test "$found_sym" == "1" ; then + { echo "$as_me:$LINENO: Found apru in ${incdir} and ${libdir}" >&5 +echo "$as_me: Found apru in ${incdir} and ${libdir}" >&6;} + + echo "$CPPFLAGS" | grep -- "-I"${incdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + CPPFLAGS="$CPPFLAGS -I"${incdir}"" + fi + + else + { echo "$as_me:$LINENO: Symbol 'apu_version' not found in library aprutil-1 in ${libdir}" >&5 +echo "$as_me: Symbol 'apu_version' not found in library aprutil-1 in ${libdir}" >&6;} + fi + else + echo "$as_me:$LINENO: result: failed to find library file" >&5 +echo "${ECHO_T}failed to find library file" >&6 + { { echo "$as_me:$LINENO: error: The --with-apru-libdir option must be used" >&5 +echo "$as_me: error: The --with-apru-libdir option must be used" >&2;} + { (exit 1); exit 1; }; } + fi +else + echo "$as_me:$LINENO: result: failed to find header file" >&5 +echo "${ECHO_T}failed to find header file" >&6 + { { echo "$as_me:$LINENO: error: The --with-apru-incdir option must be used" >&5 +echo "$as_me: error: The --with-apru-incdir option must be used" >&2;} + { (exit 1); exit 1; }; } +fi + + + +# Check whether --with-EXPAT or --without-EXPAT was given. +if test "${with_EXPAT+set}" = set; then + withval="$with_EXPAT" + expatpfxdir=$withval +else + expatpfxdir=nada +fi; + +# Check whether --with-EXPAT-lib or --without-EXPAT-lib was given. +if test "${with_EXPAT_lib+set}" = set; then + withval="$with_EXPAT_lib" + expatlibdir=$withval +else + expatlibdir=nada +fi; + +# Check whether --with-EXPAT-inc or --without-EXPAT-inc was given. +if test "${with_EXPAT_inc+set}" = set; then + withval="$with_EXPAT_inc" + expatincdir=$withval +else + expatincdir=nada +fi; +pfxval="${expatpfxdir}" +incval="${expatincdir}" +libval="${expatlibdir}" +echo "$as_me:$LINENO: checking for expat XML Parser library and header" >&5 +echo $ECHO_N "checking for expat XML Parser library and header... $ECHO_C" >&6 +hlvm_found_lib=0 +hlvm_found_inc=0 +if test "${pfxval}" != "nada" ; then + if test -d "${pfxval}" ; then + +hlvm_found_inc=0 +if test -d "${pfxval}" ; then + if test -n "expat.h" ; then + for dir in "${pfxval}/include" "${pfxval}" "${pfxval}/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + + +hlvm_found_lib=0 +if test -d "${pfxval}" ; then + if test -n "expat" ; then + for dir in "${pfxval}" "${pfxval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; + { { echo "$as_me:$LINENO: error: The --with-expat value must be a directory" >&5 +echo "$as_me: error: The --with-expat value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi +else + if test "${libval}" != "nada" ; then + +hlvm_found_lib=0 +if test -d "${libval}" ; then + if test -n "expat" ; then + for dir in "${libval}" "${libval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + fi + if test "${incval}" != "nada" ; then + +hlvm_found_inc=0 +if test -d "${incval}" ; then + if test -n "expat.h" ; then + for dir in "${incval}/include" "${incval}" "${incval}/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + + fi +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr" ; then + if test -n "expat" ; then + for dir in "/usr" "/usr/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr/local" ; then + if test -n "expat" ; then + for dir in "/usr/local" "/usr/local/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/proj/install" ; then + if test -n "expat" ; then + for dir in "/proj/install" "/proj/install/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/sw" ; then + if test -n "expat" ; then + for dir in "/sw" "/sw/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/opt" ; then + if test -n "expat" ; then + for dir in "/opt" "/opt/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libexpat.so" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.a" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libexpat.la" ; then + expat_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr" ; then + if test -n "expat.h" ; then + for dir in "/usr/include" "/usr" "/usr/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr/local" ; then + if test -n "expat.h" ; then + for dir in "/usr/local/include" "/usr/local" "/usr/local/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/proj/install" ; then + if test -n "expat.h" ; then + for dir in "/proj/install/include" "/proj/install" "/proj/install/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/sw" ; then + if test -n "expat.h" ; then + for dir in "/sw/include" "/sw" "/sw/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/opt" ; then + if test -n "expat.h" ; then + for dir in "/opt/include" "/opt" "/opt/include/expat" ; do + if test -d "$dir" ; then + if test -f "$dir/expat.h" ; then + expat_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" == 1 ; then + if test "$hlvm_found_lib" == 1 ; then + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + incdir=${expat_INC} + libdir=${expat_LIB} + + echo "$LDFLAGS" | grep -- "-L"${libdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + LDFLAGS="$LDFLAGS -L"${libdir}"" + fi + + echo "$as_me:$LINENO: checking for library containing XML_ParserCreate" >&5 +echo $ECHO_N "checking for library containing XML_ParserCreate... $ECHO_C" >&6 +if test "${ac_cv_search_XML_ParserCreate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_XML_ParserCreate=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - LIBS="-lexpat $LIBS" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XML_ParserCreate (); +int +main () +{ +XML_ParserCreate (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_XML_ParserCreate="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_XML_ParserCreate" = no; then + for ac_lib in expat; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XML_ParserCreate (); +int +main () +{ +XML_ParserCreate (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_XML_ParserCreate="-l$ac_lib" +break else - { { echo "$as_me:$LINENO: error: expat Library is required: -lexpat" >&5 -echo "$as_me: error: expat Library is required: -lexpat" >&2;} + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_XML_ParserCreate" >&5 +echo "${ECHO_T}$ac_cv_search_XML_ParserCreate" >&6 +if test "$ac_cv_search_XML_ParserCreate" != no; then + test "$ac_cv_search_XML_ParserCreate" = "none required" || LIBS="$ac_cv_search_XML_ParserCreate $LIBS" + found_sym=1 +else + found_sym=0 +fi + + if test "$found_sym" == "1" ; then + { echo "$as_me:$LINENO: Found expat in ${incdir} and ${libdir}" >&5 +echo "$as_me: Found expat in ${incdir} and ${libdir}" >&6;} + + echo "$CPPFLAGS" | grep -- "-I"${incdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + CPPFLAGS="$CPPFLAGS -I"${incdir}"" + fi + + else + { echo "$as_me:$LINENO: Symbol 'XML_ParserCreate' not found in library expat in ${libdir}" >&5 +echo "$as_me: Symbol 'XML_ParserCreate' not found in library expat in ${libdir}" >&6;} + fi + else + echo "$as_me:$LINENO: result: failed to find library file" >&5 +echo "${ECHO_T}failed to find library file" >&6 + { { echo "$as_me:$LINENO: error: The --with-expat-libdir option must be used" >&5 +echo "$as_me: error: The --with-expat-libdir option must be used" >&2;} { (exit 1); exit 1; }; } + fi +else + echo "$as_me:$LINENO: result: failed to find header file" >&5 +echo "${ECHO_T}failed to find header file" >&6 + { { echo "$as_me:$LINENO: error: The --with-expat-incdir option must be used" >&5 +echo "$as_me: error: The --with-expat-incdir option must be used" >&2;} + { (exit 1); exit 1; }; } fi + + +# Check whether --with-SYCK or --without-SYCK was given. +if test "${with_SYCK+set}" = set; then + withval="$with_SYCK" + syckpfxdir=$withval +else + syckpfxdir=nada +fi; + +# Check whether --with-SYCK-lib or --without-SYCK-lib was given. +if test "${with_SYCK_lib+set}" = set; then + withval="$with_SYCK_lib" + sycklibdir=$withval +else + sycklibdir=nada +fi; + +# Check whether --with-SYCK-inc or --without-SYCK-inc was given. +if test "${with_SYCK_inc+set}" = set; then + withval="$with_SYCK_inc" + syckincdir=$withval +else + syckincdir=nada +fi; +pfxval="${syckpfxdir}" +incval="${syckincdir}" +libval="${sycklibdir}" +echo "$as_me:$LINENO: checking for Syck Yaml Handler library and header" >&5 +echo $ECHO_N "checking for Syck Yaml Handler library and header... $ECHO_C" >&6 +hlvm_found_lib=0 +hlvm_found_inc=0 +if test "${pfxval}" != "nada" ; then + if test -d "${pfxval}" ; then + +hlvm_found_inc=0 +if test -d "${pfxval}" ; then + if test -n "syck.h" ; then + for dir in "${pfxval}/include" "${pfxval}" "${pfxval}/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi fi + +hlvm_found_lib=0 +if test -d "${pfxval}" ; then + if test -n "syck" ; then + for dir in "${pfxval}" "${pfxval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + else + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; + { { echo "$as_me:$LINENO: error: The --with-syck value must be a directory" >&5 +echo "$as_me: error: The --with-syck value must be a directory" >&2;} + { (exit 1); exit 1; }; } + fi else - if test -r "$HLVM_WITH_EXPAT/libexpat.la" ; then - LIBS="$HLVM_WITH_EXPAT/libexpat.la $LIBS" + if test "${libval}" != "nada" ; then + +hlvm_found_lib=0 +if test -d "${libval}" ; then + if test -n "syck" ; then + for dir in "${libval}" "${libval}/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + + fi + if test "${incval}" != "nada" ; then + +hlvm_found_inc=0 +if test -d "${incval}" ; then + if test -n "syck.h" ; then + for dir in "${incval}/include" "${incval}" "${incval}/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + + fi +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr" ; then + if test -n "syck" ; then + for dir in "/usr" "/usr/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/usr/local" ; then + if test -n "syck" ; then + for dir in "/usr/local" "/usr/local/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/proj/install" ; then + if test -n "syck" ; then + for dir in "/proj/install" "/proj/install/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/sw" ; then + if test -n "syck" ; then + for dir in "/sw" "/sw/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_lib" != 1 ; then + +hlvm_found_lib=0 +if test -d "/opt" ; then + if test -n "syck" ; then + for dir in "/opt" "/opt/lib" ; do + if test -d "$dir" ; then + if test -f "$dir/libsyck.so" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.a" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + elif test -f "$dir/libsyck.la" ; then + syck_LIB=$dir + + hlvm_found_lib=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr" ; then + if test -n "syck.h" ; then + for dir in "/usr/include" "/usr" "/usr/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/usr/local" ; then + if test -n "syck.h" ; then + for dir in "/usr/local/include" "/usr/local" "/usr/local/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/proj/install" ; then + if test -n "syck.h" ; then + for dir in "/proj/install/include" "/proj/install" "/proj/install/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/sw" ; then + if test -n "syck.h" ; then + for dir in "/sw/include" "/sw" "/sw/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" != 1 ; then + +hlvm_found_inc=0 +if test -d "/opt" ; then + if test -n "syck.h" ; then + for dir in "/opt/include" "/opt" "/opt/include/syck" ; do + if test -d "$dir" ; then + if test -f "$dir/syck.h" ; then + syck_INC="$dir" + + hlvm_found_inc=1 + fi + fi + done + fi +fi + +fi +if test "$hlvm_found_inc" == 1 ; then + if test "$hlvm_found_lib" == 1 ; then + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + incdir=${syck_INC} + libdir=${syck_LIB} + + echo "$LDFLAGS" | grep -- "-L"${libdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + LDFLAGS="$LDFLAGS -L"${libdir}"" + fi + + echo "$as_me:$LINENO: checking for library containing syck_parse" >&5 +echo $ECHO_N "checking for library containing syck_parse... $ECHO_C" >&6 +if test "${ac_cv_search_syck_parse+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_syck_parse=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char syck_parse (); +int +main () +{ +syck_parse (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_syck_parse="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_syck_parse" = no; then + for ac_lib in syck; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char syck_parse (); +int +main () +{ +syck_parse (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_syck_parse="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_syck_parse" >&5 +echo "${ECHO_T}$ac_cv_search_syck_parse" >&6 +if test "$ac_cv_search_syck_parse" != no; then + test "$ac_cv_search_syck_parse" = "none required" || LIBS="$ac_cv_search_syck_parse $LIBS" + found_sym=1 +else + found_sym=0 +fi + + if test "$found_sym" == "1" ; then + { echo "$as_me:$LINENO: Found syck in ${incdir} and ${libdir}" >&5 +echo "$as_me: Found syck in ${incdir} and ${libdir}" >&6;} + + echo "$CPPFLAGS" | grep -- "-I"${incdir}"" >/dev/null 2>/dev/null + if test $? -ne 0 ; then + CPPFLAGS="$CPPFLAGS -I"${incdir}"" + fi + + else + { echo "$as_me:$LINENO: Symbol 'syck_parse' not found in library syck in ${libdir}" >&5 +echo "$as_me: Symbol 'syck_parse' not found in library syck in ${libdir}" >&6;} + fi else - { { echo "$as_me:$LINENO: error: Can't find libexpat.la" >&5 -echo "$as_me: error: Can't find libexpat.la" >&2;} + echo "$as_me:$LINENO: result: failed to find library file" >&5 +echo "${ECHO_T}failed to find library file" >&6 + { { echo "$as_me:$LINENO: error: The --with-syck-libdir option must be used" >&5 +echo "$as_me: error: The --with-syck-libdir option must be used" >&2;} { (exit 1); exit 1; }; } fi +else + echo "$as_me:$LINENO: result: failed to find header file" >&5 +echo "${ECHO_T}failed to find header file" >&6 + { { echo "$as_me:$LINENO: error: The --with-syck-incdir option must be used" >&5 +echo "$as_me: error: The --with-syck-incdir option must be used" >&2;} + { (exit 1); exit 1; }; } fi +LDFLAGS="-L${HLVM_WITH_LLVM_OBJ}/lib/Debug -L${prefix}/lib -L/usr/local/lib ${LDFLAGS}" +if test "$HLVM_EFENCE" = true ; then + +echo "$as_me:$LINENO: checking for malloc in -lefence" >&5 +echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6 +if test "${ac_cv_lib_efence_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lefence $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char malloc (); +int +main () +{ +malloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_efence_malloc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_efence_malloc=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6 +if test $ac_cv_lib_efence_malloc = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBEFENCE 1 +_ACEOF + + LIBS="-lefence $LIBS" + +else + { { echo "$as_me:$LINENO: error: Electric Fence library is required: -lefence" >&5 +echo "$as_me: error: Electric Fence library is required: -lefence" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + echo "$as_me:$LINENO: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then @@ -4691,8 +6145,7 @@ - -for ac_header in apr-1/apr.h apr-1/apu.h expat.h llvm/Module.h +for ac_header in expat_external.h llvm/Module.h syck_st.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -5548,11 +7001,6 @@ s, at HLVM_COPYRIGHT@,$HLVM_COPYRIGHT,;t t s, at HLVM_PACKAGE@,$HLVM_PACKAGE,;t t s, at HLVM_VERSION@,$HLVM_VERSION,;t t -s, at USE_@,$USE_,;t t -s, at _BIN@,$_BIN,;t t -s, at _DIR@,$_DIR,;t t -s, at _INC@,$_INC,;t t -s, at _LIB@,$_LIB,;t t s, at HLVM_SO_VERSION@,$HLVM_SO_VERSION,;t t s, at HLVM_SO_CURRENT@,$HLVM_SO_CURRENT,;t t s, at HLVM_SO_REVISION@,$HLVM_SO_REVISION,;t t @@ -5584,6 +7032,14 @@ s, at CXXFLAGS@,$CXXFLAGS,;t t s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at ifGNUmake@,$ifGNUmake,;t t +s, at apr_INC@,$apr_INC,;t t +s, at apr_LIB@,$apr_LIB,;t t +s, at apru_INC@,$apru_INC,;t t +s, at apru_LIB@,$apru_LIB,;t t +s, at expat_INC@,$expat_INC,;t t +s, at expat_LIB@,$expat_LIB,;t t +s, at syck_INC@,$syck_INC,;t t +s, at syck_LIB@,$syck_LIB,;t t s, at EGREP@,$EGREP,;t t s, at HLVM_CFGNAME@,$HLVM_CFGNAME,;t t s, at HLVM_CONFIGTIME@,$HLVM_CONFIGTIME,;t t _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Thu May 11 10:20:12 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Thu, 11 May 2006 11:20:12 -0400 Subject: [hlvm-commits] r36 - hlvm/Reader/Yaml Message-ID: <200605111520.k4BFKCQF001489@sneezy.swagora.com> Author: reid Date: 2006-05-11 11:20:11 -0400 (Thu, 11 May 2006) New Revision: 36 Log: Initial slice at YamlReader implementation. Added: hlvm/Reader/Yaml/YamlReader.cpp hlvm/Reader/Yaml/YamlReader.h Modified: hlvm/Reader/Yaml/Makefile Modified: hlvm/Reader/Yaml/Makefile =================================================================== --- hlvm/Reader/Yaml/Makefile 2006-05-11 06:01:48 UTC (rev 35) +++ hlvm/Reader/Yaml/Makefile 2006-05-11 15:20:11 UTC (rev 36) @@ -1,5 +1,9 @@ ##===- hlvm/Reader/XML/Makefile ----------------------------*- Makefile -*-===## LEVEL=../../.. DIRS= +LIBRARYNAME = HLVMYamlReader +DONT_BUILD_RELINKED := 1 +BUILD_ARCHIVE := 1 +INSTALL_INCLUDES := YamlReader.h include $(LEVEL)/Makefile.hlvm Added: hlvm/Reader/Yaml/YamlReader.cpp =================================================================== --- hlvm/Reader/Yaml/YamlReader.cpp 2006-05-11 06:01:48 UTC (rev 35) +++ hlvm/Reader/Yaml/YamlReader.cpp 2006-05-11 15:20:11 UTC (rev 36) @@ -0,0 +1,36 @@ +// +// Copyright (C) 2006 HLVM Group. All Rights Reserved. +// +// This program is open source software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License (GPL) as published by +// the Free Software Foundation; either version 2 of the License, or (at your +// option) any later version. You should have received a copy of the GPL in a +// file named COPYING that was included with this program; if not, you can +// obtain a copy of the license through the Internet at http://www.fsf.org/ +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +//////////////////////////////////////////////////////////////////////////////// +/// @file hlvm/Reader/Yaml/YamlReader.cpp +/// @author Reid Spencer (original author) +/// @date 2006/05/04 +/// @since 0.1.0 +/// @brief Declares the class hlvm::YamlReader.cpp +//////////////////////////////////////////////////////////////////////////////// + +#include "YamlReader.h" +#include + +namespace hlvm { + +class YamlReaderImpl : public YamlReader { +}; + +YamlReader* YamlReader::create() { + return new YamlReaderImpl(); +} + +} // hlvm Added: hlvm/Reader/Yaml/YamlReader.h =================================================================== --- hlvm/Reader/Yaml/YamlReader.h 2006-05-11 06:01:48 UTC (rev 35) +++ hlvm/Reader/Yaml/YamlReader.h 2006-05-11 15:20:11 UTC (rev 36) @@ -0,0 +1,64 @@ +// +// Copyright (C) 2006 HLVM Group. All Rights Reserved. +// +// This program is open source software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License (GPL) as published by +// the Free Software Foundation; either version 2 of the License, or (at your +// option) any later version. You should have received a copy of the GPL in a +// file named COPYING that was included with this program; if not, you can +// obtain a copy of the license through the Internet at http://www.fsf.org/ +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +//////////////////////////////////////////////////////////////////////////////// +/// @file hlvm/Reader/Yaml/YamlReader.h +/// @author Reid Spencer (original author) +/// @date 2006/05/04 +/// @since 0.1.0 +/// @brief Declares the class hlvm::YamlReader.h +//////////////////////////////////////////////////////////////////////////////// + +#ifndef HLVM_YAML_READER_YAMLREADER_H +#define HLVM_YAML_READER_YAMLREADER_H + +#include + +namespace hlvm { + + /// This class provides an interface to reading HLVM's AST via a Yaml + /// document. + /// @brief Interface to Reading Yaml AST documents. + class YamlReader + { + /// @name Constructors + /// @{ + public: + /// The constructor static method to create a YamlReader. This creates + /// the correct sublcass of YamlReader which is an implementation detail. + static YamlReader* create(); + protected: + YamlReader() {} + + /// @} + /// @name Accessors + /// @{ + public: + + /// @} + /// @name Mutators + /// @{ + public: + void parse(const llvm::sys::Path& path); + + /// @} + /// @name Data + /// @{ + protected: + /// @} + }; + +} // hlvm +#endif _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Thu May 11 10:40:01 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Thu, 11 May 2006 11:40:01 -0400 Subject: [hlvm-commits] r37 - hlvm/Reader/Yaml Message-ID: <200605111540.k4BFe10v001516@sneezy.swagora.com> Author: reid Date: 2006-05-11 11:40:00 -0400 (Thu, 11 May 2006) New Revision: 37 Log: Add skeleton for YamlReader. Modified: hlvm/Reader/Yaml/YamlReader.cpp Modified: hlvm/Reader/Yaml/YamlReader.cpp =================================================================== --- hlvm/Reader/Yaml/YamlReader.cpp 2006-05-11 15:20:11 UTC (rev 36) +++ hlvm/Reader/Yaml/YamlReader.cpp 2006-05-11 15:40:00 UTC (rev 37) @@ -21,16 +21,50 @@ /// @brief Declares the class hlvm::YamlReader.cpp //////////////////////////////////////////////////////////////////////////////// -#include "YamlReader.h" +#include +#include #include -namespace hlvm { +namespace { -class YamlReaderImpl : public YamlReader { +class YamlReaderImpl : public hlvm::YamlReader { + public: + YamlReaderImpl() { + parser_ = syck_new_parser(); + syck_parser_handler(parser_, SyckNodeHandler(NodeHandler)); + syck_parser_error_handler(parser_, SyckErrorHandler(ErrorHandler)); + syck_parser_bad_anchor_handler(parser_, + SyckBadAnchorHandler(BadAnchorHandler)); + } + + static SYMID NodeHandler(SyckParser*, SyckNode* ) + { + return 0; + } + + static void ErrorHandler(SyckParser*, char*) + { + } + + static SyckNode* BadAnchorHandler(SyckParser*, char*) + { + return 0; + } + + void parse(const llvm::sys::Path& path) { + llvm::sys::MappedFile mapfile(path); + mapfile.map(); + syck_parser_str(parser_, mapfile.charBase(), mapfile.size(),0); + root_ = syck_parse(parser_); + } + + private: + SyckParser* parser_; + SYMID root_; }; -YamlReader* YamlReader::create() { +} // anonymous + +hlvm::YamlReader* hlvm::YamlReader::create() { return new YamlReaderImpl(); } - -} // hlvm _______________________________________________ hlvm-commits mailing list hlvm-commits at hlvm.org http://hlvm.org/mailman/listinfo/hlvm-commits From rspencer at reidspencer.com Thu May 11 20:47:33 2006 From: rspencer at reidspencer.com (rspencer at reidspencer.com) Date: Thu, 11 May 2006 21:47:33 -0400 Subject: [hlvm-commits] r38 - / Message-ID: <200605120147.k4C1lXiI002963@sneezy.swagora.com> Author: reid Date: 2006-05-11 21:47:32 -0400 (Thu, 11 May 2006) New Revision: 38 Log: Add the obligatory top level files including the LGPL license. Added: CREDITS.txt ChangeLog LICENSE.txt README.txt Added: CREDITS.txt =================================================================== --- CREDITS.txt 2006-05-11 15:40:00 UTC (rev 37) +++ CREDITS.txt 2006-05-12 01:47:32 UTC (rev 38) @@ -0,0 +1,14 @@ +This file is a partial list of people who have contributed to the LLVM +project. If you have contributed a patch or made some other contribution to +HLVM, please submit a patch to this file to add yourself, and it will be +done! + +The list is sorted by name and formatted to allow easy grepping and +beautification by scripts. The fields are: name (N), email (E), web-address +(W), PGP key ID and fingerprint (P), description (D), and snail-mail address +(S). + +N: Reid Spencer +E: rspencer at reidspencer.com +W: http://hlvm.org/ +D: Project Founder, primary architect Added: ChangeLog =================================================================== --- ChangeLog 2006-05-11 15:40:00 UTC (rev 37) +++ ChangeLog 2006-05-12 01:47:32 UTC (rev 38) @@ -0,0 +1 @@ +2006.04.25 - Initial Subversion Repository Started Added: LICENSE.txt =================================================================== --- LICENSE.txt 2006-05-11 15:40:00 UTC (rev 37) +++ LICENSE.txt 2006-05-12 01:47:32 UTC (rev 38) @@ -0,0 +1,536 @@ +============================================================================== +HLVM Release License +============================================================================== +Copyright (c) 2006 HLVM Group. All rights reserved. + +Unless otherwise stated, the license for HLVM software is the Lesser General +Public License (LGPL) as given below. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with HLVM +============================================================================== +The HLVM software contains code written by third parties. Such software will +be located in its own subdirectory and have its own individual LICENSE.TXT file +in that subdirectory. This file will describe the copyrights, license, and restrictions which apply to that code. Whever a LICENSE.txt file appears it applies +to all software in that directory and in any subdirectories below it. +LICENSE.txt files found in subdirectories override the license found in +directories above them. + +The disclaimer of warranty in the LGPL applies equally to all code in the HLVM +Distribution, and nothing in any of the other licenses gives permission to use +the names of the HLVM Group to endorse or promote products derived from this +Software. + +The following pieces of software have additional or alternate copyrights, +licenses, and/or restrictions: + +Program Directory License +------- --------- ------- +HLVM Tools hlvm/tools/* GPL + +============================================================================== +Lesser General Public License (LGPL) +============================================================================== + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this Lice