diff options
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | makeinclude.in | 8 |
2 files changed, 19 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 0b1036287..c8c37ff46 100644 --- a/configure.in +++ b/configure.in @@ -67,6 +67,12 @@ AC_SUBST(FL_VERSION) AC_SUBST(ARCHFLAGS) AC_SUBST(OPTIM) +dnl FLTK build options to be used in Makefiles (defined in makeinclude) +BUILD_GDI="No" +BUILD_X11="No" +BUILD_XFT="No" +USEMMFILES="No" + dnl OS-specific pre-tests... dnl host_os_gui equals $host_os unless we target Cygwin or Darwin in combination with X11. host_os_gui=$host_os @@ -829,8 +835,6 @@ AC_ARG_WITH(links, [ --with-links make header links for common missp INSTALL_DESKTOP="" UNINSTALL_DESKTOP="" -USEMMFILES="No" - case $host_os_gui in cygwin* | mingw*) dnl Cygwin environment, using windows GDI ... @@ -843,6 +847,7 @@ case $host_os_gui in LDFLAGS="-mwindows $LDFLAGS" DSOFLAGS="-mwindows $DSOFLAGS" LIBS="$LIBS -lole32 -luuid -lcomctl32" + BUILD_GDI="Yes" if test "x$with_optim" = x; then dnl Avoid -Os optimization on Cygwin/MinGW with_optim="-O3" @@ -938,6 +943,7 @@ case $host_os_gui in LDFLAGS="$X_LIBS $LDFLAGS" DSOFLAGS="$X_LIBS $DSOFLAGS" AC_DEFINE(USE_X11) + BUILD_X11="Yes" if test "x$x_includes" != x; then ac_cpp="$ac_cpp -I$x_includes" fi @@ -1002,6 +1008,7 @@ case $host_os_gui in AC_CHECK_HEADER(X11/Xft/Xft.h, AC_CHECK_LIB(Xft, XftDrawCreate, AC_DEFINE(USE_XFT) + BUILD_XFT="Yes" LIBS="-lXft $LIBS")) fi fi @@ -1097,6 +1104,9 @@ AC_SUBST(THREADS) AC_SUBST(INSTALL_DESKTOP) AC_SUBST(UNINSTALL_DESKTOP) +AC_SUBST(BUILD_GDI) +AC_SUBST(BUILD_X11) +AC_SUBST(BUILD_XFT) AC_SUBST(USEMMFILES) dnl Figure out the appropriate formatted man page extension... diff --git a/makeinclude.in b/makeinclude.in index 6cff5774c..0dfdb28ef 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -26,6 +26,13 @@ FL_DSO_VERSION = @FL_DSO_VERSION@ FL_ABI_VERSION = @FL_ABI_VERSION@ FL_VERSION = @FL_VERSION@ +# FLTK configuration options + +BUILD_GDI = @BUILD_GDI@ +BUILD_X11 = @BUILD_X11@ +BUILD_XFT = @BUILD_XFT@ +USEMMFILES = @USEMMFILES@ + # Standard configure variables prefix = @prefix@ @@ -39,7 +46,6 @@ mandir = @mandir@ srcdir = @srcdir@ docdir = $(datadir)/doc/fltk VPATH = @srcdir@ -USEMMFILES = @USEMMFILES@ # programs we use... DOXYDOC = @DOXYDOC@ |