[llvm-commits] [hlvm] r38003 - in /hlvm/trunk: autoconf/configure.ac autoconf/m4/find_library.m4 configure

Reid Spencer reid at x10sys.com
Sat Jul 7 16:58:51 PDT 2007


Author: reid
Date: Sat Jul  7 18:58:51 2007
New Revision: 38003

URL: http://llvm.org/viewvc/llvm-project?rev=38003&view=rev
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:
    hlvm/trunk/autoconf/m4/find_library.m4
Modified:
    hlvm/trunk/autoconf/configure.ac
    hlvm/trunk/configure

Modified: hlvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/autoconf/configure.ac?rev=38003&r1=38002&r2=38003&view=diff

==============================================================================
--- hlvm/trunk/autoconf/configure.ac (original)
+++ hlvm/trunk/autoconf/configure.ac Sat Jul  7 18:58:51 2007
@@ -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: hlvm/trunk/autoconf/m4/find_library.m4
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/autoconf/m4/find_library.m4?rev=38003&view=auto

==============================================================================
--- hlvm/trunk/autoconf/m4/find_library.m4 (added)
+++ hlvm/trunk/autoconf/m4/find_library.m4 Sat Jul  7 18:58:51 2007
@@ -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: hlvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/configure?rev=38003&r1=38002&r2=38003&view=diff

==============================================================================
--- hlvm/trunk/configure (original)
+++ hlvm/trunk/configure Sat Jul  7 18:58:51 2007
@@ -315,7 +315,7 @@
 # include <unistd.h>
 #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>  dir=location of the HLVM workspace storage
                           (default=/opt/hlvm)
   --with-expat=<dir>      Specify where the expat lbrary is located
@@ -901,6 +885,28 @@
                           (default=/usr)
   --with-llvm-gcc=<dir>   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,1049 +1384,1479 @@
 
 
 
+HLVM_SO_CURRENT="0"
+HLVM_SO_REVISION="10"
+HLVM_SO_AGE="0"
+HLVM_SO_VERSION="${HLVM_SO_CURRENT}:${HLVM_SO_REVISION}:${HLVM_SO_AGE}"
 
-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
+echo "$as_me:$LINENO: checking whether to install in a shared prefix" >&5
+echo $ECHO_N "checking whether to install in a shared prefix... $ECHO_C" >&6
+# Check whether --enable-sharedprefix or --disable-sharedprefix was given.
+if test "${enable_sharedprefix+set}" = set; then
+  enableval="$enable_sharedprefix"
+  case "${enableval}" in
+    yes) HLVM_SHAREDPREFIX=true;;
+    no)  HLVM_SHAREDPREFIX=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-sharedprefix" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-sharedprefix" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 else
-  aprincdir=nada
+  HLVM_SHAREDPREFIX=true
 fi;
-eval pfxval=\$\{aprpfxdir\}
-eval binval=\$\{aprbindir\}
-eval incval=\$\{aprincdir\}
-eval libvar=\$\{aprlibdir\}
-if test "${pfxval}" != "nada" ; then
+echo "$as_me:$LINENO: result: $HLVM_SHAREDPREFIX" >&5
+echo "${ECHO_T}$HLVM_SHAREDPREFIX" >&6
 
-if test -n "${pfxval}" -a -d "${pfxval}" -a -n "" -a -d "${pfxval}/bin" -a -x "${pfxval}/bin/" ; then
-  USE_="USE_ = 1"
+if test "$HLVM_SHAREDPREFIX" = true ; then
 
-  =${pfxval}/bin/
+cat >>confdefs.h <<\_ACEOF
+#define HLVM_SHAREDPREFIX
+_ACEOF
 
-  _BIN=${pfxval}/bin
+fi
 
-  _DIR=${pfxval}
+echo "$as_me:$LINENO: checking whether to build debug version of HLVM" >&5
+echo $ECHO_N "checking whether to build debug version of HLVM... $ECHO_C" >&6
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+  case "${enableval}" in
+   yes) HLVM_DEBUG=true;;
+   no)  HLVM_DEBUG=false;;
+   *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_DEBUG=false
+fi;
+echo "$as_me:$LINENO: result: $HLVM_DEBUG" >&5
+echo "${ECHO_T}$HLVM_DEBUG" >&6
 
-  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
+echo "$as_me:$LINENO: checking whether to optimize compiliation of HLVM" >&5
+echo $ECHO_N "checking whether to optimize compiliation of HLVM... $ECHO_C" >&6
+# Check whether --enable-optimize or --disable-optimize was given.
+if test "${enable_optimize+set}" = set; then
+  enableval="$enable_optimize"
+  case "${enableval}" in
+    yes) HLVM_OPTIMIZE=true;;
+    no)  HLVM_OPTIMIZE=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-OPTIMIZE" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-OPTIMIZE" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_OPTIMIZE=true
+fi;
+echo "$as_me:$LINENO: result: $HLVM_OPTIMIZE" >&5
+echo "${ECHO_T}$HLVM_OPTIMIZE" >&6
 
-  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
+echo "$as_me:$LINENO: checking whether to use inline functions" >&5
+echo $ECHO_N "checking whether to use inline functions... $ECHO_C" >&6
+# Check whether --enable-INLINE or --disable-INLINE was given.
+if test "${enable_INLINE+set}" = set; then
+  enableval="$enable_INLINE"
+  case "${enableval}" in
+    yes) HLVM_INLINE=true;;
+    no)  HLVM_INLINE=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-inline" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-inline" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
 else
-  tmppfxdir=`which apr 2>&1`
-  if test -n "$tmppfxdir" -a -d "${tmppfxdir%*apr}" -a \
-          -d "${tmppfxdir%*apr}/.." ; then
-    tmppfxdir=`cd "${tmppfxdir%*apr}/.." ; pwd`
+  HLVM_INLINE=true
+fi;
+echo "$as_me:$LINENO: result: $HLVM_INLINE" >&5
+echo "${ECHO_T}$HLVM_INLINE" >&6
 
-if test -n "$tmppfxdir" -a -d "$tmppfxdir" -a -n "" -a -d "$tmppfxdir/bin" -a -x "$tmppfxdir/bin/" ; then
-  USE_="USE_ = 1"
 
-  =$tmppfxdir/bin/
+echo "$as_me:$LINENO: checking whether to perform assertion checking" >&5
+echo $ECHO_N "checking whether to perform assertion checking... $ECHO_C" >&6
+# Check whether --enable-ASSERT or --disable-ASSERT was given.
+if test "${enable_ASSERT+set}" = set; then
+  enableval="$enable_ASSERT"
+  case "${enableval}" in
+    yes) HLVM_ASSERT=true;;
+    no)  HLVM_ASSERT=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-assert" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-assert" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_ASSERT=true
+fi;
+echo "$as_me:$LINENO: result: $HLVM_ASSERT" >&5
+echo "${ECHO_T}$HLVM_ASSERT" >&6
 
-  _BIN=$tmppfxdir/bin
 
-  _DIR=$tmppfxdir
+echo "$as_me:$LINENO: checking whether to allow runtime tracing" >&5
+echo $ECHO_N "checking whether to allow runtime tracing... $ECHO_C" >&6
+# Check whether --enable-TRACE or --disable-TRACE was given.
+if test "${enable_TRACE+set}" = set; then
+  enableval="$enable_TRACE"
+  case "${enableval}" in
+    yes) HLVM_TRACE=true;;
+    no)  HLVM_TRACE=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-trace" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-trace" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_TRACE=false
+fi;
+echo "$as_me:$LINENO: result: $HLVM_TRACE" >&5
+echo "${ECHO_T}$HLVM_TRACE" >&6
 
-  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
+echo "$as_me:$LINENO: checking whether to build a small version of HLVM" >&5
+echo $ECHO_N "checking whether to build a small version of HLVM... $ECHO_C" >&6
+# Check whether --enable-SMALL or --disable-SMALL was given.
+if test "${enable_SMALL+set}" = set; then
+  enableval="$enable_SMALL"
+  case "${enableval}" in
+    yes) HLVM_SMALL=true;;
+    no)  HLVM_SMALL=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-small" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-small" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_SMALL=false
+fi;
+echo "$as_me:$LINENO: result: $HLVM_SMALL" >&5
+echo "${ECHO_T}$HLVM_SMALL" >&6
 
-  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_"\}
+echo "$as_me:$LINENO: checking whether to use Electric Fence" >&5
+echo $ECHO_N "checking whether to use Electric Fence... $ECHO_C" >&6
+# Check whether --enable-efence or --disable-efence was given.
+if test "${enable_efence+set}" = set; then
+  enableval="$enable_efence"
+  case "${enableval}" in
+    yes) HLVM_EFENCE=true;;
+    no)  HLVM_EFENCE=false;;
+    *)   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-efence" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-efence" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_EFENCE=false
+fi;
+echo "$as_me:$LINENO: result: $HLVM_EFENCE" >&5
+echo "${ECHO_T}$HLVM_EFENCE" >&6
 
-if test -n "/usr" -a -d "/usr" -a -n "" -a -d "/usr/bin" -a -x "/usr/bin/" ; then
-  USE_="USE_ = 1"
 
-  =/usr/bin/
+echo "$as_me:$LINENO: checking whether to build with profiling enabled" >&5
+echo $ECHO_N "checking whether to build with profiling enabled... $ECHO_C" >&6
+# Check whether --enable-profiling or --disable-profiling was given.
+if test "${enable_profiling+set}" = set; then
+  enableval="$enable_profiling"
+  case "${enableval}" in
+    yes) HLVM_PROFILING=true;;
+    no)  HLVM_PROFILING=false;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profiling" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-profiling" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+else
+  HLVM_PROFILING=false
+fi;
+echo "$as_me:$LINENO: result: $HLVM_PROFILING" >&5
+echo "${ECHO_T}$HLVM_PROFILING" >&6
 
-  _BIN=/usr/bin
 
-  _DIR=/usr
+echo "$as_me:$LINENO: checking location of HLVM workspace" >&5
+echo $ECHO_N "checking location of HLVM workspace... $ECHO_C" >&6
 
-  if test -n "apr-1/apr.h" -a -d "/usr/include" -a -f "/usr/include/apr-1/apr.h" ; then
-    _INC=/usr/include
+# Check whether --with-workspace or --without-workspace was given.
+if test "${with_workspace+set}" = set; then
+  withval="$with_workspace"
+  case "${withval}" in
+    /*|*/*) HLVM_WITH_WORKSPACE=$withval ;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-WORKSPACE" >&5
+echo "$as_me: error: bad value ${withval} for --with-WORKSPACE" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  esac
+else
+  HLVM_WITH_WORKSPACE=/opt/hlvm
+fi;
+echo "$as_me:$LINENO: result: $HLVM_WITH_WORKSPACE" >&5
+echo "${ECHO_T}$HLVM_WITH_WORKSPACE" >&6
 
-  fi
-  if test -n "libapr-1.so" -a -d "/usr/lib" -a -f "/usr/lib/libapr-1.so" ; then
-    _LIB=/usr/lib
 
-  fi
-fi
+echo "$as_me:$LINENO: checking location of expat library" >&5
+echo $ECHO_N "checking location of expat library... $ECHO_C" >&6
 
-    if test -z "${checkval}" ; then
+# Check whether --with-expat or --without-expat was given.
+if test "${with_expat+set}" = set; then
+  withval="$with_expat"
+  case "${withval}" in
+     /*) HLVM_WITH_EXPAT=$withval ;;
+     *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-expat" >&5
+echo "$as_me: error: bad value ${withval} for --with-expat" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  esac
+else
+  HLVM_WITH_EXPAT=/usr
+fi;
+echo "$as_me:$LINENO: result: $HLVM_WITH_EXPAT" >&5
+echo "${ECHO_T}$HLVM_WITH_EXPAT" >&6
 
-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/
+echo "$as_me:$LINENO: checking location of additional header files" >&5
+echo $ECHO_N "checking location of additional header files... $ECHO_C" >&6
 
-  _BIN=/usr/local/bin
+# Check whether --with-includes or --without-includes was given.
+if test "${with_includes+set}" = set; then
+  withval="$with_includes"
+  case "${withval}" in
+     -I/*) HLVM_WITH_INCLUDES=$withval ;;
+     *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-includes" >&5
+echo "$as_me: error: bad value ${withval} for --with-includes" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  esac
+else
+  HLVM_WITH_INCLUDES=
+fi;
+echo "$as_me:$LINENO: result: $HLVM_WITH_INCLUDES" >&5
+echo "${ECHO_T}$HLVM_WITH_INCLUDES" >&6
 
-  _DIR=/usr/local
+CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE $HLVM_WITH_INCLUDES"
 
-  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
+echo "$as_me:$LINENO: checking location of LLVM source code" >&5
+echo $ECHO_N "checking location of LLVM source code... $ECHO_C" >&6
 
-  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
+# Check whether --with-llvm-src or --without-llvm-src was given.
+if test "${with_llvm_src+set}" = set; then
+  withval="$with_llvm_src"
+  case "${withval}" in
+    /*|*/*) HLVM_WITH_LLVM_SRC=$withval ;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-llvm-src" >&5
+echo "$as_me: error: bad value ${withval} for --with-llvm-src" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  esac
+else
+  HLVM_WITH_LLVM_SRC=/usr
+fi;
+echo "$as_me:$LINENO: result: $HLVM_WITH_LLVM_SRC" >&5
+echo "${ECHO_T}$HLVM_WITH_LLVM_SRC" >&6
 
-  fi
-fi
 
-      if test -z "${checkval}" ; then
+echo "$as_me:$LINENO: checking location of LLVM object code" >&5
+echo $ECHO_N "checking location of LLVM object code... $ECHO_C" >&6
 
-if test -n "/sw" -a -d "/sw" -a -n "" -a -d "/sw/bin" -a -x "/sw/bin/" ; then
-  USE_="USE_ = 1"
+# Check whether --with-llvm-obj or --without-llvm-obj was given.
+if test "${with_llvm_obj+set}" = set; then
+  withval="$with_llvm_obj"
+  case "${withval}" in
+    /*|*/*) HLVM_WITH_LLVM_OBJ=$withval ;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-llvm-obj" >&5
+echo "$as_me: error: bad value ${withval} for --with-llvm-obj" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  esac
+else
+  HLVM_WITH_LLVM_OBJ=/usr
+fi;
+echo "$as_me:$LINENO: result: $HLVM_WITH_LLVM_OBJ" >&5
+echo "${ECHO_T}$HLVM_WITH_LLVM_OBJ" >&6
 
-  =/sw/bin/
 
-  _BIN=/sw/bin
+echo "$as_me:$LINENO: checking location of LLVM GCC compiler" >&5
+echo $ECHO_N "checking location of LLVM GCC compiler... $ECHO_C" >&6
 
-  _DIR=/sw
+# Check whether --with-llvm-gcc or --without-llvm-gcc was given.
+if test "${with_llvm_gcc+set}" = set; then
+  withval="$with_llvm_gcc"
+  case "${withval}" in
+    /*|*/*) HLVM_WITH_LLVMGCC=$withval ;;
+    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-llvmgcc" >&5
+echo "$as_me: error: bad value ${withval} for --with-llvmgcc" >&2;}
+   { (exit 1); exit 1; }; } ;;
+  esac
+else
+  HLVM_WITH_LLVMGCC=""
+fi;
+echo "$as_me:$LINENO: result: $HLVM_WITH_LLVMGCC" >&5
+echo "${ECHO_T}$HLVM_WITH_LLVMGCC" >&6
 
-  if test -n "apr-1/apr.h" -a -d "/sw/include" -a -f "/sw/include/apr-1/apr.h" ; then
-    _INC=/sw/include
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  if test -n "libapr-1.so" -a -d "/sw/lib" -a -f "/sw/lib/libapr-1.so" ; then
-    _LIB=/sw/lib
+done
+done
 
-  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
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 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 -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  if test -n "libapr-1.so" -a -d "//lib" -a -f "//lib/libapr-1.so" ; then
-    _LIB=//lib
+done
+done
 
-  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
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  apr-utilpfxdir=nada
-fi;
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+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
+  CC=$ac_ct_CC
 else
-  apr-utilbindir=nada
-fi;
+  CC="$ac_cv_prog_CC"
+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
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 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
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 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
-
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  if test -n "libaprutil-1.so" -a -d "${pfxval}/lib" -a -f "${pfxval}/lib/libaprutil-1.so" ; then
-    _LIB=${pfxval}/lib
+done
+done
 
-  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
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 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
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  if test -n "libaprutil-1.so" -a -d "$tmppfxdir/lib" -a -f "$tmppfxdir/lib/libaprutil-1.so" ; then
-    _LIB=$tmppfxdir/lib
+done
+done
 
-  fi
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 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
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
 
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  if test -n "libaprutil-1.so" -a -d "/usr/lib" -a -f "/usr/lib/libaprutil-1.so" ; then
-    _LIB=/usr/lib
+done
+done
 
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+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 -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   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
+done
+done
 
-  fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 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
-
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  if test -n "libaprutil-1.so" -a -d "/sw/lib" -a -f "/sw/lib/libaprutil-1.so" ; then
-    _LIB=/sw/lib
+done
+done
 
-  fi
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 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
+  test -n "$ac_ct_CC" && break
+done
 
-  fi
-  if test -n "libaprutil-1.so" -a -d "/opt/lib" -a -f "/opt/lib/libaprutil-1.so" ; then
-    _LIB=/opt/lib
+  CC=$ac_ct_CC
+fi
 
-  fi
 fi
 
-          if test -z "${checkval}" ; then
 
-if test -n "/" -a -d "/" -a -n "" -a -d "//bin" -a -x "//bin/" ; then
-  USE_="USE_ = 1"
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 
-  =//bin/
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-  _BIN=//bin
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  _DIR=/
+int
+main ()
+{
 
-  if test -n "apr-1/apu.h" -a -d "//include" -a -f "//include/apr-1/apu.h" ; then
-    _INC=//include
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
 
-  fi
-  if test -n "libaprutil-1.so" -a -d "//lib" -a -f "//lib/libaprutil-1.so" ; then
-    _LIB=//lib
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+	;;
+    conftest.$ac_ext )
+	# This is the source file.
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
+	break;;
+    * )
+	break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  fi
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
 fi
 
-            if test -z "${checkval}" ; then
-              checkresult="no"
-            fi
-          fi
-        fi
-      fi
+ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (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
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    echo "$as_me:$LINENO: result: $checkresult" >&5
-echo "${ECHO_T}$checkresult" >&6
   fi
 fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
 
-HLVM_SO_CURRENT="0"
-HLVM_SO_REVISION="10"
-HLVM_SO_AGE="0"
-HLVM_SO_VERSION="${HLVM_SO_CURRENT}:${HLVM_SO_REVISION}:${HLVM_SO_AGE}"
-
-
-
-
-
-echo "$as_me:$LINENO: checking whether to install in a shared prefix" >&5
-echo $ECHO_N "checking whether to install in a shared prefix... $ECHO_C" >&6
-# Check whether --enable-sharedprefix or --disable-sharedprefix was given.
-if test "${enable_sharedprefix+set}" = set; then
-  enableval="$enable_sharedprefix"
-  case "${enableval}" in
-    yes) HLVM_SHAREDPREFIX=true;;
-    no)  HLVM_SHAREDPREFIX=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-sharedprefix" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-sharedprefix" >&2;}
-   { (exit 1); exit 1; }; };;
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  export ac_cv_exeext
+	  break;;
+    * ) break;;
   esac
+done
 else
-  HLVM_SHAREDPREFIX=true
-fi;
-echo "$as_me:$LINENO: result: $HLVM_SHAREDPREFIX" >&5
-echo "${ECHO_T}$HLVM_SHAREDPREFIX" >&6
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-if test "$HLVM_SHAREDPREFIX" = true ; then
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
 
-cat >>confdefs.h <<\_ACEOF
-#define HLVM_SHAREDPREFIX
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
+int
+main ()
+{
 
-echo "$as_me:$LINENO: checking whether to build debug version of HLVM" >&5
-echo $ECHO_N "checking whether to build debug version of HLVM... $ECHO_C" >&6
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-  case "${enableval}" in
-   yes) HLVM_DEBUG=true;;
-   no)  HLVM_DEBUG=false;;
-   *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
-   { (exit 1); exit 1; }; };;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
   esac
+done
 else
-  HLVM_DEBUG=false
-fi;
-echo "$as_me:$LINENO: result: $HLVM_DEBUG" >&5
-echo "${ECHO_T}$HLVM_DEBUG" >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-echo "$as_me:$LINENO: checking whether to optimize compiliation of HLVM" >&5
-echo $ECHO_N "checking whether to optimize compiliation of HLVM... $ECHO_C" >&6
-# Check whether --enable-optimize or --disable-optimize was given.
-if test "${enable_optimize+set}" = set; then
-  enableval="$enable_optimize"
-  case "${enableval}" in
-    yes) HLVM_OPTIMIZE=true;;
-    no)  HLVM_OPTIMIZE=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-OPTIMIZE" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-OPTIMIZE" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  HLVM_OPTIMIZE=true
-fi;
-echo "$as_me:$LINENO: result: $HLVM_OPTIMIZE" >&5
-echo "${ECHO_T}$HLVM_OPTIMIZE" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-echo "$as_me:$LINENO: checking whether to use inline functions" >&5
-echo $ECHO_N "checking whether to use inline functions... $ECHO_C" >&6
-# Check whether --enable-INLINE or --disable-INLINE was given.
-if test "${enable_INLINE+set}" = set; then
-  enableval="$enable_INLINE"
-  case "${enableval}" in
-    yes) HLVM_INLINE=true;;
-    no)  HLVM_INLINE=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-inline" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-inline" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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_compiler_gnu=yes
 else
-  HLVM_INLINE=true
-fi;
-echo "$as_me:$LINENO: result: $HLVM_INLINE" >&5
-echo "${ECHO_T}$HLVM_INLINE" >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
-echo "$as_me:$LINENO: checking whether to perform assertion checking" >&5
-echo $ECHO_N "checking whether to perform assertion checking... $ECHO_C" >&6
-# Check whether --enable-ASSERT or --disable-ASSERT was given.
-if test "${enable_ASSERT+set}" = set; then
-  enableval="$enable_ASSERT"
-  case "${enableval}" in
-    yes) HLVM_ASSERT=true;;
-    no)  HLVM_ASSERT=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-assert" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-assert" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-else
-  HLVM_ASSERT=true
-fi;
-echo "$as_me:$LINENO: result: $HLVM_ASSERT" >&5
-echo "${ECHO_T}$HLVM_ASSERT" >&6
-
-
-echo "$as_me:$LINENO: checking whether to allow runtime tracing" >&5
-echo $ECHO_N "checking whether to allow runtime tracing... $ECHO_C" >&6
-# Check whether --enable-TRACE or --disable-TRACE was given.
-if test "${enable_TRACE+set}" = set; then
-  enableval="$enable_TRACE"
-  case "${enableval}" in
-    yes) HLVM_TRACE=true;;
-    no)  HLVM_TRACE=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-trace" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-trace" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-else
-  HLVM_TRACE=false
-fi;
-echo "$as_me:$LINENO: result: $HLVM_TRACE" >&5
-echo "${ECHO_T}$HLVM_TRACE" >&6
-
-
-echo "$as_me:$LINENO: checking whether to build a small version of HLVM" >&5
-echo $ECHO_N "checking whether to build a small version of HLVM... $ECHO_C" >&6
-# Check whether --enable-SMALL or --disable-SMALL was given.
-if test "${enable_SMALL+set}" = set; then
-  enableval="$enable_SMALL"
-  case "${enableval}" in
-    yes) HLVM_SMALL=true;;
-    no)  HLVM_SMALL=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-small" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-small" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  HLVM_SMALL=false
-fi;
-echo "$as_me:$LINENO: result: $HLVM_SMALL" >&5
-echo "${ECHO_T}$HLVM_SMALL" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
-echo "$as_me:$LINENO: checking whether to use Electric Fence" >&5
-echo $ECHO_N "checking whether to use Electric Fence... $ECHO_C" >&6
-# Check whether --enable-efence or --disable-efence was given.
-if test "${enable_efence+set}" = set; then
-  enableval="$enable_efence"
-  case "${enableval}" in
-    yes) HLVM_EFENCE=true;;
-    no)  HLVM_EFENCE=false;;
-    *)   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-efence" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-efence" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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_prog_cc_g=yes
 else
-  HLVM_EFENCE=false
-fi;
-echo "$as_me:$LINENO: result: $HLVM_EFENCE" >&5
-echo "${ECHO_T}$HLVM_EFENCE" >&6
-
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: checking whether to build with profiling enabled" >&5
-echo $ECHO_N "checking whether to build with profiling enabled... $ECHO_C" >&6
-# Check whether --enable-profiling or --disable-profiling was given.
-if test "${enable_profiling+set}" = set; then
-  enableval="$enable_profiling"
-  case "${enableval}" in
-    yes) HLVM_PROFILING=true;;
-    no)  HLVM_PROFILING=false;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profiling" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-profiling" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
 else
-  HLVM_PROFILING=false
-fi;
-echo "$as_me:$LINENO: result: $HLVM_PROFILING" >&5
-echo "${ECHO_T}$HLVM_PROFILING" >&6
-
-
-echo "$as_me:$LINENO: checking location of HLVM workspace" >&5
-echo $ECHO_N "checking location of HLVM workspace... $ECHO_C" >&6
-
-# Check whether --with-workspace or --without-workspace was given.
-if test "${with_workspace+set}" = set; then
-  withval="$with_workspace"
-  case "${withval}" in
-    /*|*/*) HLVM_WITH_WORKSPACE=$withval ;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-WORKSPACE" >&5
-echo "$as_me: error: bad value ${withval} for --with-WORKSPACE" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  HLVM_WITH_WORKSPACE=/opt/hlvm
-fi;
-echo "$as_me:$LINENO: result: $HLVM_WITH_WORKSPACE" >&5
-echo "${ECHO_T}$HLVM_WITH_WORKSPACE" >&6
-
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
-echo "$as_me:$LINENO: checking location of expat library" >&5
-echo $ECHO_N "checking location of expat library... $ECHO_C" >&6
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-# Check whether --with-expat or --without-expat was given.
-if test "${with_expat+set}" = set; then
-  withval="$with_expat"
-  case "${withval}" in
-     /*) HLVM_WITH_EXPAT=$withval ;;
-     *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-expat" >&5
-echo "$as_me: error: bad value ${withval} for --with-expat" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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_prog_cc_stdc=$ac_arg
+break
 else
-  HLVM_WITH_EXPAT=/usr
-fi;
-echo "$as_me:$LINENO: result: $HLVM_WITH_EXPAT" >&5
-echo "${ECHO_T}$HLVM_WITH_EXPAT" >&6
-
-
-echo "$as_me:$LINENO: checking location of additional header files" >&5
-echo $ECHO_N "checking location of additional header files... $ECHO_C" >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Check whether --with-includes or --without-includes was given.
-if test "${with_includes+set}" = set; then
-  withval="$with_includes"
-  case "${withval}" in
-     -I/*) HLVM_WITH_INCLUDES=$withval ;;
-     *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-includes" >&5
-echo "$as_me: error: bad value ${withval} for --with-includes" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
-else
-  HLVM_WITH_INCLUDES=
-fi;
-echo "$as_me:$LINENO: result: $HLVM_WITH_INCLUDES" >&5
-echo "${ECHO_T}$HLVM_WITH_INCLUDES" >&6
+fi
+rm -f conftest.err conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
 
-CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE $HLVM_WITH_INCLUDES"
+fi
 
-echo "$as_me:$LINENO: checking location of LLVM source code" >&5
-echo $ECHO_N "checking location of LLVM source code... $ECHO_C" >&6
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
 
-# Check whether --with-llvm-src or --without-llvm-src was given.
-if test "${with_llvm_src+set}" = set; then
-  withval="$with_llvm_src"
-  case "${withval}" in
-    /*|*/*) HLVM_WITH_LLVM_SRC=$withval ;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-llvm-src" >&5
-echo "$as_me: error: bad value ${withval} for --with-llvm-src" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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
+  for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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
+  :
 else
-  HLVM_WITH_LLVM_SRC=/usr
-fi;
-echo "$as_me:$LINENO: result: $HLVM_WITH_LLVM_SRC" >&5
-echo "${ECHO_T}$HLVM_WITH_LLVM_SRC" >&6
-
-
-echo "$as_me:$LINENO: checking location of LLVM object code" >&5
-echo $ECHO_N "checking location of LLVM object code... $ECHO_C" >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Check whether --with-llvm-obj or --without-llvm-obj was given.
-if test "${with_llvm_obj+set}" = set; then
-  withval="$with_llvm_obj"
-  case "${withval}" in
-    /*|*/*) HLVM_WITH_LLVM_OBJ=$withval ;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-llvm-obj" >&5
-echo "$as_me: error: bad value ${withval} for --with-llvm-obj" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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
+  break
 else
-  HLVM_WITH_LLVM_OBJ=/usr
-fi;
-echo "$as_me:$LINENO: result: $HLVM_WITH_LLVM_OBJ" >&5
-echo "${ECHO_T}$HLVM_WITH_LLVM_OBJ" >&6
-
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: checking location of LLVM GCC compiler" >&5
-echo $ECHO_N "checking location of LLVM GCC compiler... $ECHO_C" >&6
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
 
-# Check whether --with-llvm-gcc or --without-llvm-gcc was given.
-if test "${with_llvm_gcc+set}" = set; then
-  withval="$with_llvm_gcc"
-  case "${withval}" in
-    /*|*/*) HLVM_WITH_LLVMGCC=$withval ;;
-    *) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-llvmgcc" >&5
-echo "$as_me: error: bad value ${withval} for --with-llvmgcc" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
 else
-  HLVM_WITH_LLVMGCC=""
-fi;
-echo "$as_me:$LINENO: result: $HLVM_WITH_LLVMGCC" >&5
-echo "${ECHO_T}$HLVM_WITH_LLVMGCC" >&6
-
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
   fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  ac_cpp_err=yes
 fi
-
-  CC=$ac_ct_CC
+if test -z "$ac_cpp_err"; then
+  :
 else
-  CC="$ac_cv_prog_CC"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
 fi
+rm -f conftest.err conftest.$ac_ext
 
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+
+    done
+    ac_cv_prog_CPP=$CPP
 
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  CPP=$ac_cv_prog_CPP
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
   fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  ac_cpp_err=yes
 fi
-
-  CC=$ac_ct_CC
+if test -z "$ac_cpp_err"; then
+  :
 else
-  CC="$ac_cv_prog_CC"
-fi
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Broken: fails on valid input.
+continue
 fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+rm -f conftest.err conftest.$ac_ext
 
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
   fi
+else
+  ac_cpp_err=yes
 fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in gcc
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2462,7 +2898,7 @@
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2502,239 +2938,36 @@
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (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
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+  CC=$ac_ct_CC
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
-fi
 
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
 echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
@@ -3098,288 +3331,54 @@
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
   { (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
-  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_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  (eval $ac_try) 2>&5
   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); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
+  (exit $ac_status); }; }; then
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Passes both tests.
-ac_preproc_ok=:
-break
 fi
-rm -f conftest.err conftest.$ac_ext
-
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc
+  for ac_prog in $CCC g++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3388,7 +3387,7 @@
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3397,31 +3396,31 @@
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-    test -n "$CC" && break
+    test -n "$CXX" && break
   done
 fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in gcc
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in $CCC g++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3430,7 +3429,7 @@
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3439,31 +3438,26 @@
 
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-  test -n "$ac_ct_CC" && break
+  test -n "$ac_ct_CXX" && break
 done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  CC=$ac_ct_CC
+  CXX=$ac_ct_CXX
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
 # Provide some information about the compiler.
 echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+     "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
@@ -3481,9 +3475,9 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3513,7 +3507,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 { ac_try='test -z "$ac_cxx_werror_flag"
 			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -3534,18 +3528,18 @@
 ac_compiler_gnu=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3572,7 +3566,124 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 { ac_try='test -z "$ac_cxx_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_objext'
+  { (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_prog_cxx_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_cxx_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_objext'
+  { (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
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_cxx_werror_flag"
 			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -3585,104 +3696,446 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+echo "$as_me:$LINENO: checking for GNU make" >&5
+echo $ECHO_N "checking for GNU make... $ECHO_C" >&6
+if test "${llvm_cv_gnu_make_command+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  llvm_cv_gnu_make_command=''
+ for a in "$MAKE" make gmake gnumake ; do
+  if test -z "$a" ; then continue ; fi ;
+  if  ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null )
+  then
+   llvm_cv_gnu_make_command=$a ;
+   break;
   fi
+ done
+fi
+echo "$as_me:$LINENO: result: $llvm_cv_gnu_make_command" >&5
+echo "${ECHO_T}$llvm_cv_gnu_make_command" >&6
+ if test "x$llvm_cv_gnu_make_command" != "x"  ; then
+   ifGNUmake='' ;
+ else
+   ifGNUmake='#' ;
+   echo "$as_me:$LINENO: result: \"Not found\"" >&5
+echo "${ECHO_T}\"Not found\"" >&6;
+ fi
+
+
+
+
+
+
+# Check whether --with-APR or --without-APR was given.
+if test "${with_APR+set}" = set; then
+  withval="$with_APR"
+  aprpfxdir=$withval
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
+  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
-    CFLAGS=
+    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
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+
+  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_cv_prog_cc_stdc=no
-ac_save_CC=$CC
+  ac_func_search_save_LIBS=$LIBS
+ac_cv_search_apr_allocator_alloc=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
+/* 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 apr_allocator_alloc ();
 int
 main ()
 {
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+apr_allocator_alloc ();
   ;
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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
@@ -3696,48 +4149,48 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+	 { 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_prog_cc_stdc=$ac_arg
-break
+  ac_cv_search_apr_allocator_alloc="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+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.  */
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
+/* 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
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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
@@ -3751,39 +4204,453 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+	 { 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
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
+  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
+  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
+
+
+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
+
+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_func_search_save_LIBS=$LIBS
+ac_cv_search_apu_version=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.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 ()
 {
-exit (42);
+apu_version ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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
@@ -3797,38 +4664,48 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+	 { 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="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+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.  */
-$ac_declaration
+
+/* 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 ()
 {
-exit (42);
+apu_version ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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
@@ -3842,426 +4719,1096 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+	 { 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
-  break
+  ac_cv_search_apu_version="-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_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  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
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+# Check whether --with-EXPAT or --without-EXPAT was given.
+if test "${with_EXPAT+set}" = set; then
+  withval="$with_EXPAT"
+  expatpfxdir=$withval
 else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+  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
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+  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
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+
+  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
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  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
 
-    test -n "$CXX" && break
-  done
+  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
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+
   fi
-done
-done
+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
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+if test "$hlvm_found_inc" != 1 ; then
 
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+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"
 
-  CXX=$ac_ct_CXX
+          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
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+    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.  */
+
+/* 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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&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); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&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); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  (exit $ac_status); }; }; then
+  ac_cv_search_XML_ParserCreate="none required"
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  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 ()
 {
-#ifndef __GNUC__
-       choke me
-#endif
-
+XML_ParserCreate ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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_cxx_werror_flag"
+	 { 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_objext'
+	 { 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_compiler_gnu=yes
+  ac_cv_search_XML_ParserCreate="-l$ac_lib"
+break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+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
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  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
 
-int
-main ()
-{
+fi
+if test "$hlvm_found_inc" != 1 ; then
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 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_cxx_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_objext'
-  { (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_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+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"
 
-ac_cv_prog_cxx_g=no
+          hlvm_found_inc=1
+        fi
+      fi
+    done
+  fi
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
+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
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
+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
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
+
+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.  */
-$ac_declaration
-#include <stdlib.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 ()
 {
-exit (42);
+syck_parse ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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_cxx_werror_flag"
+	 { 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_objext'
+	 { 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
 
-continue
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
+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.  */
-$ac_declaration
+
+/* 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 ()
 {
-exit (42);
+syck_parse ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+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_cxx_werror_flag"
+	 { 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_objext'
+	 { 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
-  break
+  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_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+  done
 fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-echo "$as_me:$LINENO: checking for GNU make" >&5
-echo $ECHO_N "checking for GNU make... $ECHO_C" >&6
-if test "${llvm_cv_gnu_make_command+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+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
-  llvm_cv_gnu_make_command=''
- for a in "$MAKE" make gmake gnumake ; do
-  if test -z "$a" ; then continue ; fi ;
-  if  ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null )
-  then
-   llvm_cv_gnu_make_command=$a ;
-   break;
-  fi
- done
+  found_sym=0
 fi
-echo "$as_me:$LINENO: result: $llvm_cv_gnu_make_command" >&5
-echo "${ECHO_T}$llvm_cv_gnu_make_command" >&6
- if test "x$llvm_cv_gnu_make_command" != "x"  ; then
-   ifGNUmake='' ;
- else
-   ifGNUmake='#' ;
-   echo "$as_me:$LINENO: result: \"Not found\"" >&5
-echo "${ECHO_T}\"Not found\"" >&6;
- 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: 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
@@ -4340,99 +5887,6 @@
 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
-else
-
-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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lexpat  $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_Parse ();
-int
-main ()
-{
-XML_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_lib_expat_XML_Parse=yes
-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
-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
-_ACEOF
-
-  LIBS="-lexpat $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: expat Library is required: -lexpat" >&5
-echo "$as_me: error: expat Library is required: -lexpat" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-
-else
-  if test -r "$HLVM_WITH_EXPAT/libexpat.la" ; then
-    LIBS="$HLVM_WITH_EXPAT/libexpat.la $LIBS"
-  else
-    { { echo "$as_me:$LINENO: error: Can't find libexpat.la" >&5
-echo "$as_me: error: Can't find libexpat.la" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
 
 
 echo "$as_me:$LINENO: checking for egrep" >&5
@@ -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





More information about the llvm-commits mailing list