Fixes

jonclayden · Mar 13, 2024 · a60d598 · a60d598
1 parent 4bff902
commit a60d598
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/configure b/configure
@@ -642,6 +642,7 @@ ac_includes_default="\
 ac_header_cxx_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+LIBDISPATCH_CXXFLAGS
 LIBDISPATCH_CPPFLAGS
 OPENMP_CXXFLAGS
 OBJEXT
@@ -3085,7 +3086,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler flag for block support" >&5
 printf %s "checking compiler flag for block support... " >&6; }
-orig_CXX_FLAGS=$CXX_FLAGS
+orig_CXXFLAGS=$CXXFLAGS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { return ^{return 0;}(); }
@@ -3099,7 +3100,7 @@ printf "%s\n" "none required" >&6; }
 
 else case e in #(
   e)
-    CXX_FLAGS="$orig_CXX_FLAGS -fblocks"
+    CXXFLAGS="$orig_CXXFLAGS -fblocks"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { return ^{return 0;}(); }
@@ -3108,6 +3109,7 @@ if ac_fn_cxx_try_compile "$LINENO"
 then :
 
         LIBDISPATCH_CPPFLAGS="$LIBDISPATCH_CPPFLAGS -DHAVE_BLOCKS"
+        LIBDISPATCH_CXXFLAGS="-fblocks"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: -fblocks" >&5
 printf "%s\n" "-fblocks" >&6; }
 
@@ -3123,7 +3125,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-CXX_FLAGS=$orig_CXX_FLAGS
+CXXFLAGS=$orig_CXXFLAGS
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing _Block_copy" >&5
 printf %s "checking for library containing _Block_copy... " >&6; }
@@ -3195,6 +3197,7 @@ fi
 
 
 
+
 ac_config_files="$ac_config_files src/Makevars"
 
 cat >confcache <<\_ACEOF

diff --git a/configure.ac b/configure.ac
@@ -29,6 +29,7 @@ AC_SUBST(OPENMP_CXXFLAGS)
 m4_include([tools/m4/jc_dispatch.m4])
 JC_DISPATCH
 AC_SUBST(LIBDISPATCH_CPPFLAGS)
+AC_SUBST(LIBDISPATCH_CXXFLAGS)
 
 AC_CONFIG_FILES([src/Makevars])
 AC_OUTPUT
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,3 +1,3 @@
 PKG_CPPFLAGS = -DLEMON_DISABLE_ASSERTS @LIBDISPATCH_CPPFLAGS@ -I.
-PKG_CXXFLAGS = @OPENMP_CXXFLAGS@
-PKG_LIBS = @OPENMP_CXXFLAGS@
+PKG_CXXFLAGS = @OPENMP_CXXFLAGS@ @LIBDISPATCH_CXXFLAGS@
+PKG_LIBS = @OPENMP_CXXFLAGS@ @LIBS@
diff --git a/tools/m4/jc_dispatch.m4 b/tools/m4/jc_dispatch.m4
@@ -33,20 +33,21 @@ int main ()
 
 
 AC_MSG_CHECKING([compiler flag for block support])
-orig_[]_AC_LANG_PREFIX[]_FLAGS=$[]_AC_LANG_PREFIX[]_FLAGS
+orig_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main() { return ^{return 0;}(); }]])], [
     LIBDISPATCH_CPPFLAGS="$LIBDISPATCH_CPPFLAGS -DHAVE_BLOCKS"
     AC_MSG_RESULT([none required])
 ], [
-    []_AC_LANG_PREFIX[]_FLAGS="$orig_[]_AC_LANG_PREFIX[]_FLAGS -fblocks"
+    []_AC_LANG_PREFIX[]FLAGS="$orig_[]_AC_LANG_PREFIX[]FLAGS -fblocks"
     AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main() { return ^{return 0;}(); }]])], [
         LIBDISPATCH_CPPFLAGS="$LIBDISPATCH_CPPFLAGS -DHAVE_BLOCKS"
+        LIBDISPATCH_[]_AC_LANG_PREFIX[]FLAGS="-fblocks"
         AC_MSG_RESULT([-fblocks])
     ], [
         AC_MSG_RESULT([none])
     ])
 ])
-[]_AC_LANG_PREFIX[]_FLAGS=$orig_[]_AC_LANG_PREFIX[]_FLAGS
+[]_AC_LANG_PREFIX[]FLAGS=$orig_[]_AC_LANG_PREFIX[]FLAGS
 
 AC_SEARCH_LIBS([_Block_copy], [BlocksRuntime])
 AC_CHECK_HEADER([Block.h])