diff options
| -rw-r--r-- | configure.ac | 24 | ||||
| -rwxr-xr-x | distribute | 4 |
2 files changed, 17 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 85ab660..acdab8b 100644 --- a/configure.ac +++ b/configure.ac @@ -141,7 +141,7 @@ SCINTERM_PATH=`canonicalize $SCINTERM_PATH` AC_SUBST(SCINTERM_PATH) AC_ARG_WITH(interface, - AS_HELP_STRING([--with-interface=ncurses|pdcurses|emcurses|gtk], + AS_HELP_STRING([--with-interface=ncurses|pdcurses|gtk], [Specify user interface [default=ncurses]]), [INTERFACE=$withval], [INTERFACE=ncurses]) @@ -155,20 +155,22 @@ case $INTERFACE in AC_CHECK_FUNCS([tigetstr]) ;; pdcurses) - AC_CHECK_LIB(pdcurses, initscr, , [ - AC_MSG_ERROR([libpdcurses missing! - Perhaps it is not named correctly or has wrong permissions.]) - ]) + AC_ARG_VAR(PDCURSES_LIBS, [linker flags for PDCurses, + overriding the autoconf check]) + if [[ "x$PDCURSES_LIBS" = "x" ]]; then + AC_CHECK_LIB(pdcurses, initscr, , [ + AC_MSG_ERROR([libpdcurses missing! + Perhaps it is not named correctly or has wrong permissions.]) + ]) + else + AC_MSG_CHECKING([checking for PDCurses (PDCURSES_LIBS)]) + AC_MSG_RESULT([$PDCURSES_LIBS]) + LIBS="$LIBS $PDCURSES_LIBS" + fi AC_CHECK_FUNC([PDC_set_resize_limits], [ AC_DEFINE(PDCURSES_WIN32A, , [PDCurses supports Win32a extensions]) ]) ;; - emcurses) - # EMCurses is the PDCurses/Emscripten port - # However, ordinary library checks do not work - # under Emscripten - LIBS="$LIBS -lpdcurses" - ;; esac AC_CHECK_HEADERS([curses.h], , [ @@ -73,6 +73,10 @@ ppa : debian-source # which is required by the glib spawn functions. # If we ever build a non-console version on Windows, # we should include gspawn-win32-helper.exe instead. +# +# When linking in PDCurses/win32a statically, the +# environment variable PDCURSES_LIBS should be set to +# "-lpdcurses -lgdi32 -lcomdlg32" MINGW_UI=pdcurses mingw-binary : sciteco-$(SCITECO_VERSION)-win32.zip |