diff options
| author | roland <roland> | 2006-10-18 21:23:53 +0000 |
|---|---|---|
| committer | roland <roland> | 2006-10-18 21:23:53 +0000 |
| commit | fa1d05cdfff44b39584ba03831dae7d3f7b2258c (patch) | |
| tree | 57807a3cf6bf84d68006bcbfad3fd50fbee697d8 /configure.ac | |
| parent | c00bf7eae2ca2538d2968e7f40f61a141d3d2e6d (diff) | |
| download | systemtap-steved-fa1d05cdfff44b39584ba03831dae7d3f7b2258c.tar.gz systemtap-steved-fa1d05cdfff44b39584ba03831dae7d3f7b2258c.tar.xz systemtap-steved-fa1d05cdfff44b39584ba03831dae7d3f7b2258c.zip | |
2006-10-18 Roland McGrath <roland@redhat.com>
PR 2727
* configure.ac (elfutils build): Pass --prefix and --exec-prefix
options to elfutils configure.
(elfutils_abs_srcdir): New substituted variable.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
* configure, config.in, Makefile.in: Regenerated.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index fb0287b9..93dbec19 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,9 @@ yes) AC_MSG_ERROR([--with-elfutils requires an argument]) ;; *) build_elfutils=yes ;; esac]) AM_CONDITIONAL(BUILD_ELFUTILS, test $build_elfutils = yes) +AC_SUBST(elfutils_abs_srcdir, `AS_IF([test $build_elfutils = yes], + [cd $with_elfutils && pwd])`) + AM_CONDITIONAL(BUILD_LKET_B2A, pkg-config --atleast-version 2.0.0 glib-2.0) mysql=false @@ -77,7 +80,7 @@ else fi AC_CHECK_HEADERS(mysql/mysql.h, - AC_CHECK_LIB(mysqlclient, mysql_init, + AC_CHECK_LIB(mysqlclient, mysql_init, mysql=true, AC_MSG_NOTICE([*** Cannot find mysqlclient lib. Check your MySQL installation.]), []), AC_MSG_NOTICE([*** Cannot find mysql header file. Check your MySQL installation.]), []) @@ -123,12 +126,16 @@ if test $build_elfutils = yes; then AC_MSG_NOTICE([running ${elfutils_srcdir}/configure]) # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that # $ORIGIN is where libdw.so resides, which is not where there is a ../lib. + # Note that $libdir might be using a quoted use of $exec_prefix or $prefix. + # So we must make sure to pass those settings to elfutils configure. elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}" here=`pwd` (mkdir -p build-elfutils && cd build-elfutils && ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \ --includedir="${here}/include-elfutils" \ --libdir="${here}/lib-elfutils" \ + --exec-prefix="$exec_prefix" \ + --prefix="$prefix" \ CFLAGS="${CFLAGS/-Wall/}" \ LDFLAGS="$LDFLAGS $elfutils_rpath" ) |