ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.49 by gbeauche, 2006-04-06T22:36:43Z vs.
Revision 1.51 by gbeauche, 2006-05-02T05:50:38Z

# Line 28 | Line 28 | AC_ARG_ENABLE(fbdev-dga,    [  --enable-
28   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
29   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
30   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
31 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
32   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
33   AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34    [case "$withval" in
# Line 245 | Line 246 | UISRCS=../dummy/prefs_editor_dummy.cpp
246   case "x$WANT_GTK" in
247   xgtk2*)
248    AM_PATH_GTK_2_0(1.3.15, [
249 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
250 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
250 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
251 <    LIBS="$LIBS $GTK_LIBS"
252 <    UISRCS=prefs_editor_gtk.cpp
249 >    GUI_CFLAGS="$GTK_CFLAGS"
250 >    GUI_LIBS="$GTK_LIBS"
251      WANT_GTK=gtk2
252    ], [
253      case "x${WANT_GTK}x" in
# Line 267 | Line 265 | xgtk2*)
265   esac
266   if [[ "x$WANT_GTK" = "xgtk" ]]; then
267    AM_PATH_GTK(1.2.0, [
268 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
269 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
272 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
273 <    LIBS="$LIBS $GTK_LIBS"
274 <    UISRCS=prefs_editor_gtk.cpp
268 >    GUI_CFLAGS="$GTK_CFLAGS"
269 >    GUI_LIBS="$GTK_LIBS"
270    ], [
271      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272      WANT_GTK=no
273    ])
274   fi
275 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
276 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
277 +  UISRCS=prefs_editor_gtk.cpp
278 + fi
279 + AC_SUBST(GUI_CFLAGS)
280 + AC_SUBST(GUI_LIBS)
281 +
282 + dnl Build external GUI if requested.
283 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
284 +  WANT_STANDALONE_GUI=no
285 + fi
286 + if [[ "$WANT_GTK" = "no" ]]; then
287 +  WANT_STANDALONE_GUI=no
288 + fi
289 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
290  
291   dnl We use ESD if possible.
292   if [[ "x$WANT_ESD" = "xyes" ]]; then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines