Fix more libtool system header includes

diff --git a/bootstrap.sh b/bootstrap.sh
index a96d338106cb6be3197818f387e56a27d13a3904..1475d8ca06d3b66284675e0638ff55029b6afd2f 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -115,12 +115,17 @@ bootstrap_libtoolize() {
         chmod u-w $makefile
 
         # Libtool 2.2.6b we bundle is slightly broken with non-portable dependencies
-        sed 's/<libltdl\/lt_system.h>/\"libltdl\/lt_system.h\"/g' $src/ltdl.h |
-            sed 's/<libltdl\/lt_error.h>/\"libltdl\/lt_error.h\"/g' |
-            sed 's/<libltdl\/lt_dlloader.h>/\"libltdl\/lt_dlloader.h\"/g' > $src/ltdl.h.new;
-        chmod u+w $src/ltdl.h
-        mv $src/ltdl.h.new $src/ltdl.h
-        chmod u-w $src/ltdl.h
+        # HACK: Make it backward-compatible by linking the bundled headers.
+        for f in ltdl.h libltdl/lt_error.h libltdl/lt_system.h libltdl/lt_dlloader.h libltdl/slist.h; do
+            echo "Fixing $f ..."
+            sed 's/<libltdl\/lt_system.h>/\"libltdl\/lt_system.h\"/g' $src/$f |
+                sed 's/<libltdl\/lt__glibc.h>/\"libltdl\/lt__glibc.h\"/g' |
+                sed 's/<libltdl\/lt_error.h>/\"libltdl\/lt_error.h\"/g' |
+                sed 's/<libltdl\/lt_dlloader.h>/\"libltdl\/lt_dlloader.h\"/g' > $src/$f.new;
+            chmod u+w $src/$f
+            mv $src/$f.new $src/$f
+            chmod u-w $src/$f
+        done
     fi
 }
 

diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am
index 5ecd433aec03fc96ec6361aaee7ed44f379ecd9b..e8d24806993739fbf75c89131026e2ca095eecfe 100644 (file)
--- a/src/adaptation/Makefile.am
+++ b/src/adaptation/Makefile.am
@@ -12,6 +12,11 @@ if USE_ECAP
 SUBDIRS += ecap
 endif
 
+if USE_LOADABLE_MODULES
+## LTDL headers require their local include path...
+INCLUDES += $(INCLTDL)
+endif
+
 noinst_LTLIBRARIES = libadaptation.la
 
 ## start with the code shared among all adaptation schemes