diff options
| author | Dodji Seketeli <dodji@seketeli.org> | 2013-05-24 05:31:28 +0200 |
|---|---|---|
| committer | Dodji Seketeli <dodji@seketeli.org> | 2013-05-24 22:41:06 +0200 |
| commit | 431b8fa5b0870562e91170b96430312d37ec0a96 (patch) | |
| tree | 1445a58b6bf487da3ec11efbc0d62e3772b0557b | |
| parent | bcf602ffdcfdd03ee86c543e81f934cb91f94c3b (diff) | |
| download | gcc-431b8fa5b0870562e91170b96430312d37ec0a96.tar.gz | |
Fix in-tree libabigail detection
* config/abigail.m4: Set abibaillibs even in the case of the case
of an in-tree libabigail.
* configure: Re-generate.
| -rw-r--r-- | config/abigail.m4 | 12 | ||||
| -rwxr-xr-x | configure | 15 |
2 files changed, 17 insertions, 10 deletions
diff --git a/config/abigail.m4 b/config/abigail.m4 index b4db85e0467..9dda668c373 100644 --- a/config/abigail.m4 +++ b/config/abigail.m4 @@ -83,10 +83,6 @@ AC_DEFUN([ABIGAIL_INIT], [found_abigail_lib=yes], [], []) fi - if test x$found_abigail_lib = xyes; then - abigaillibs="$abigaillibs -labigail" - fi - if test x$abigailinc = x; then AC_LANG_PUSH(C++) AC_CHECK_HEADER([libabigail/abg-version.h], @@ -103,7 +99,8 @@ AC_DEFUN([ABIGAIL_INIT], #Test whether libabigail is in the gcc source tree. if test x$HAVE_LIBABIGAIL != xyes; then if test -d $srcdir/libabigail -a -f $srcdir/gcc/gcc.c; then - abigaillibs='-L$$r/$(HOST_SUBDIR)/libabigail/src/'"${lt_cv_objdir} ${abigaillibs}" + libpath='$$r/$(HOST_SUBDIR)/libabigail/src/'"${lt_cv_objdir}" + abigaillibs="-L$libpath ${abigaillibs}" abigailinc='-I${srcdir}/libabigail/src '"${abigailinc}" found_abigail_lib=yes found_abigail_inc=yes @@ -112,6 +109,11 @@ AC_DEFUN([ABIGAIL_INIT], ENABLE_ABIGAIL_VERSION_CHECK=no fi fi + + if test x$found_abigail_lib = xyes; then + abigaillibs="$abigaillibs -labigail" + fi + ] ) diff --git a/configure b/configure index 0b600475dba..3387986c3f5 100755 --- a/configure +++ b/configure @@ -6908,10 +6908,6 @@ fi fi - if test x$found_abigail_lib = xyes; then - abigaillibs="$abigaillibs -labigail" - fi - if test x$abigailinc = x; then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -6931,6 +6927,9 @@ 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 x$found_abigail_inc = xyes; then + abigailinc='-Ilibabigail '"${abigailinc}" + fi fi if test x$found_abigail_lib = xyes -a x$found_abigail_inc = xyes; then @@ -6942,7 +6941,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #Test whether libabigail is in the gcc source tree. if test x$HAVE_LIBABIGAIL != xyes; then if test -d $srcdir/libabigail -a -f $srcdir/gcc/gcc.c; then - abigaillibs='-L$$r/$(HOST_SUBDIR)/libabigail/src/'"${lt_cv_objdir} ${abigaillibs}" + libpath='$$r/$(HOST_SUBDIR)/libabigail/src/'"${lt_cv_objdir}" + abigaillibs="-L$libpath ${abigaillibs}" abigailinc='-I${srcdir}/libabigail/src '"${abigailinc}" found_abigail_lib=yes found_abigail_inc=yes @@ -6953,6 +6953,11 @@ $as_echo "$as_me: WARNING: using in-tree libabigail, disabling version check" >& fi fi + if test x$found_abigail_lib = xyes; then + abigaillibs="$abigaillibs -labigail" + fi + + |