Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow use of ./configure -enable-x11 on the Mac OS platform

Browse Source 
to create an X11-using version of FLTK.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10967 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2015-12-15 16:53:52 +00:00
parent 14669685d8
commit 872d20ca61
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+18 -13
View File
@@ -46,13 +46,8 @@ case $host_os in
if test "x$with_archflags" != x ; then if test "x$with_archflags" != x ; then
CFLAGS="$CFLAGS $with_archflags" CFLAGS="$CFLAGS $with_archflags"
fi fi
USEMMFILES="Yes"
;;
*)
USEMMFILES="No"
;; ;;
esac esac
AC_SUBST(USEMMFILES)
dnl FLTK library versions... dnl FLTK library versions...
FL_MAJOR_VERSION=1 FL_MAJOR_VERSION=1
@@ -73,13 +68,13 @@ AC_SUBST(ARCHFLAGS)
AC_SUBST(OPTIM) AC_SUBST(OPTIM)
dnl OS-specific pre-tests... dnl OS-specific pre-tests...
dnl host_os_gui equals $host_os unless we target Cygwin in combination with X11. dnl host_os_gui equals $host_os unless we target Cygwin or Darwin in combination with X11.
host_os_gui=$host_os host_os_gui=$host_os
case $host_os in case $host_os in
cygwin*) cygwin*)
# Handle Cygwin option *first*, before all other tests. # Handle Cygwin option *first*, before all other tests.
AC_ARG_ENABLE(cygwin, [ --enable-cygwin use the Cygwin libraries [[default=no]]]) AC_ARG_ENABLE(cygwin, [ --enable-cygwin use the Cygwin libraries [[default=no]]])
AC_ARG_ENABLE(x11, [ --enable-x11 use Cygwin with X11 [[default=no]]]) AC_ARG_ENABLE(x11, [ --enable-x11 use with X11 [[default=no]]])
if test x$enable_cygwin = xyes; then if test x$enable_cygwin = xyes; then
# we target Cygwin in combination with X11 # we target Cygwin in combination with X11
if test x$enable_x11 = xyes; then if test x$enable_x11 = xyes; then
@@ -87,6 +82,14 @@ case $host_os in
fi fi
fi fi
;; ;;
darwin*)
if test x$enable_x11 = xyes; then
host_os_gui="X11"
OPTIM="-U__APPLE__ $OPTIM"
fi
;;
*)
;;
esac esac
dnl Define the libraries and link options we will need. dnl Define the libraries and link options we will need.
@@ -397,12 +400,6 @@ AC_ARG_WITH(archflags, [ --with-archflags="flags"
use custom architecture flags use custom architecture flags
(possible Mac OS X values include -arch i386, -arch x86_64, -arch ppc)], (possible Mac OS X values include -arch i386, -arch x86_64, -arch ppc)],
ARCHFLAGS="$withval") ARCHFLAGS="$withval")
case $host_os in
darwin*)
# QD is not supported anymore since 1.3
AC_DEFINE(__APPLE_QUARTZ__)
;;
esac
dnl Find commands... dnl Find commands...
AC_PROG_INSTALL AC_PROG_INSTALL
@@ -832,6 +829,8 @@ AC_ARG_WITH(links, [ --with-links make header links for common missp
INSTALL_DESKTOP="" INSTALL_DESKTOP=""
UNINSTALL_DESKTOP="" UNINSTALL_DESKTOP=""
USEMMFILES="No"
case $host_os_gui in case $host_os_gui in
cygwin* | mingw*) cygwin* | mingw*)
dnl Cygwin environment, using windows GDI ... dnl Cygwin environment, using windows GDI ...
@@ -878,6 +877,10 @@ case $host_os_gui in
;; ;;
darwin*) darwin*)
AC_DEFINE(__APPLE_QUARTZ__)
USEMMFILES="Yes"
# MacOS X uses Cocoa for graphics. # MacOS X uses Cocoa for graphics.
LIBS="$LIBS -framework Cocoa" LIBS="$LIBS -framework Cocoa"
@@ -1090,6 +1093,8 @@ AC_SUBST(THREADS)
AC_SUBST(INSTALL_DESKTOP) AC_SUBST(INSTALL_DESKTOP)
AC_SUBST(UNINSTALL_DESKTOP) AC_SUBST(UNINSTALL_DESKTOP)
AC_SUBST(USEMMFILES)
dnl Figure out the appropriate formatted man page extension... dnl Figure out the appropriate formatted man page extension...
case "$host_os" in case "$host_os" in
*bsd* | darwin*) *bsd* | darwin*)