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.19 by gbeauche, 2005-03-13T12:49:30Z vs.
Revision 1.20 by gbeauche, 2005-03-19T09:59:30Z

# Line 21 | Line 21 | AC_ARG_ENABLE(xf86-dga,     [  --enable-
21   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
22   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
23   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
24 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
24 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
25 >  [case "$withval" in
26 >   gtk1)      WANT_GTK="gtk";;
27 >   gtk|gtk2)  WANT_GTK="$withval";;
28 >   yes)       WANT_GTK="gtk2 gtk";;
29 >   *)         WANT_GTK="no";;
30 >   esac],
31 >  [WANT_GTK="gtk2 gtk"])
32   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
33   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
34  
# Line 222 | Line 229 | fi
229  
230   dnl We use GTK+ if possible.
231   UISRCS=../dummy/prefs_editor_dummy.cpp
232 < if [[ "x$WANT_GTK" = "xyes" ]]; then
232 > case "x$WANT_GTK" in
233 > xgtk2*)
234 >  AM_PATH_GTK_2_0(1.3.15, [
235 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
236 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
237 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
238 >    LIBS="$LIBS $GTK_LIBS"
239 >    UISRCS=prefs_editor_gtk.cpp
240 >    WANT_GTK=gtk2
241 >  ], [
242 >    case "x${WANT_GTK}x" in
243 >    *gtkx)
244 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
245 >      WANT_GTK=gtk
246 >      ;;
247 >    *)
248 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
249 >      WANT_GTK=no
250 >      ;;
251 >    esac
252 >  ])
253 >  ;;
254 > esac
255 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
256    AM_PATH_GTK(1.2.0, [
257      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
258      CFLAGS="$CFLAGS $GTK_CFLAGS"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines