Skip to content

Commit

Permalink
Expand the root directory for ocamltest cppflags variable
Browse files Browse the repository at this point in the history
  • Loading branch information
MisterDA committed Apr 18, 2024
1 parent a1cb25d commit 55916b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -942,14 +942,12 @@ AS_IF([test x"$supports_shared_libraries" != 'xfalse'], [
[dnl When bootstrapping from the git submodule (flexdll directory), just
dnl use that, however if another directory has been specified with
dnl --with-flexdll=<path> then copy the contents of <path> to
dnl flexdll-sources. This allows us to guarantee that flexdll is always
dnl built at one directory level below the root, so we can specify
dnl ROOTDIR=..
dnl flexdll-sources.
AS_IF([m4_normalize([test x"$with_flexdll" = 'x'
|| test x"$with_flexdll" = 'xflexdll'])],
[AS_IF([test -f 'flexdll/flexdll.h'],
[flexdll_source_dir=flexdll
iflexdir='$(ROOTDIR)/flexdll'
iflexdir="$ocamlsrcdir\\flexdll"
with_flexdll="$iflexdir"],
[AS_IF([test x"$with_flexdll" != 'x'],
[AC_MSG_RESULT([requested but not available])
Expand All @@ -959,7 +957,7 @@ AS_IF([test x"$supports_shared_libraries" != 'xfalse'], [
[mkdir -p flexdll-sources
cp -r "$with_flexdll"/* flexdll-sources/
flexdll_source_dir='flexdll-sources'
iflexdir='$(ROOTDIR)/flexdll-sources'
iflexdir="$ocamlsrcdir\\flexdll-sources"
flexmsg=" (from $with_flexdll)"],
[AC_MSG_RESULT([requested but not available])
AC_MSG_ERROR([exiting])])])
Expand Down

0 comments on commit 55916b0

Please sign in to comment.