[PPL-devel] [GIT] ppl/ppl(master): Cater for versions of SWI-Prolog configured with `--disable-libdirversion' .

[Roberto Bagnara]

Module: ppl/ppl
Branch: master
Commit: 3f70fc76500b85748b84b7c6263afecc188281a3
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f70fc76500b85748b84b7c6263afecc188281a3

Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date:   Sun Mar 25 15:26:14 2012 +0200

Cater for versions of SWI-Prolog configured with `--disable-libdirversion'.

---

 m4/ac_check_swi_prolog.m4 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4
index 2c7fd8d..8ea56fd 100644
--- a/m4/ac_check_swi_prolog.m4
+++ b/m4/ac_check_swi_prolog.m4
@@ -62,7 +62,10 @@ then
   # In Fedora, SWI-Prolog.h is installed only in /usr/include/pl, which,
   # IMHO, is a bug (https://bugzilla.redhat.com/show_bug.cgi?id=471071).
   SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl"
-  SWI_PROLOG_LD_OPTIONS="-L${swi_prolog_base}/lib/${swi_prolog_arch} ${swi_prolog_lib} ${swi_prolog_libs}"
+  # If SWI-Prolog was configured with `--disable-libdirversion', then
+  # the files are not in the `${swi_prolog_arch}' subdirectory.  Since
+  # currently there is no way to know that, we look in both places.
+  SWI_PROLOG_LD_OPTIONS="-L${swi_prolog_base}/lib/${swi_prolog_arch} -L${swi_prolog_base}/lib ${swi_prolog_lib} ${swi_prolog_libs}"
   ac_save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS"
   AC_LANG_PUSH(C++)