Skip to content

Commit

Permalink
Add --enable-wine, disable it, try to build
Browse files Browse the repository at this point in the history
  • Loading branch information
norbusan committed Sep 17, 2024
1 parent 2d0dc90 commit e211e9a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
echo "PATH = $PATH"
export PATH
ls "/c/program files/steel bank common lisp"
./configure --with-lisp=sbcl --with-sbcl=sbcl.exe --enable-distribution
./configure --with-lisp=sbcl --with-sbcl=sbcl.exe --enable-windows --enable-distribution
make
ls
4 changes: 4 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ enable_rebuild_doc = @enable_rebuild_doc@
enable_traditional_layout = @enable_traditional_layout@
# --enable-windows
enable_windows = @enable_windows@
# --enable-wine
enable_wine = @enable_wine@
# --enable-distribution
enable_distribution = @enable_distribution@
# lispdir of emacs
Expand Down Expand Up @@ -155,7 +157,9 @@ ifeq ($(enable_windows),yes)
prefix = $(srcdir)
# we only support building
lisp = sbcl
ifeq ($(enable_wine),yes)
SBCL_INTERPRETER = wine sbcl
endif
# it seems that windows sbcl does not like this cmd line args
SBCL_BUILDOPTS =
cafeobj_share = $(prefix)/$(PACKAGE)-$(VERSION)-sbcl
Expand Down
14 changes: 14 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ ac_header_c_list=
ac_subst_vars='LTLIBOBJS
LIBOBJS
enable_distribution
enable_wine
enable_windows
enable_traditional_layout
enable_rebuild_doc
Expand Down Expand Up @@ -742,6 +743,7 @@ with_lispdir
enable_rebuild_doc
enable_traditional_layout
enable_windows
enable_wine
enable_distribution
'
ac_precious_vars='build_alias
Expand Down Expand Up @@ -1382,6 +1384,7 @@ Optional Features:
--enable-traditional-layout
Enable traditional layout [default=no]
--enable-windows Prepare for Windows building
--enable-wine Prepare for Windows building with Wine
--enable-distribution Configure for binary distribution
Optional Packages:
Expand Down Expand Up @@ -4774,6 +4777,17 @@ fi



# Check whether --enable-wine was given.
if test ${enable_wine+y}
then :
enableval=$enable_wine; enable_wine="${enableval}"
else case e in #(
e) enable_wine=no ;;
esac
fi



# Check whether --enable-distribution was given.
if test ${enable_distribution+y}
then :
Expand Down
7 changes: 7 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,13 @@ AC_ARG_ENABLE(windows,
[enable_windows=no])
AC_SUBST(enable_windows)

AC_ARG_ENABLE(wine,
[AS_HELP_STRING([--enable-wine],
[Prepare for Windows building with Wine])],
[enable_wine="${enableval}"],
[enable_wine=no])
AC_SUBST(enable_wine)

AC_ARG_ENABLE(distribution,
[AS_HELP_STRING([--enable-distribution],
[Configure for binary distribution])],
Expand Down

0 comments on commit e211e9a

Please sign in to comment.