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

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.48 by gbeauche, 2005-06-12T23:36:34Z vs.
Revision 1.49 by gbeauche, 2005-06-19T15:52:09Z

# Line 60 | Line 60 | AC_ARG_ENABLE(addressing,
60  
61   dnl External packages.
62   AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
63 < AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
63 > AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]],
64 >  [case "$withval" in
65 >   gtk1)      WANT_GTK="gtk";;
66 >   gtk|gtk2)  WANT_GTK="$withval";;
67 >   yes)       WANT_GTK="gtk2 gtk";;
68 >   *)         WANT_GTK="no";;
69 >   esac],
70 >  [WANT_GTK="gtk2 gtk"])
71   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
72  
73   dnl Canonical system information.
# Line 239 | Line 246 | fi
246  
247   dnl We use GTK+ if possible.
248   UISRCS=../dummy/prefs_editor_dummy.cpp
249 < if [[ "x$WANT_GTK" = "xyes" ]]; then
249 > case "x$WANT_GTK" in
250 > xgtk2*)
251 >  AM_PATH_GTK_2_0(1.3.15, [
252 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
253 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
254 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
255 >    LIBS="$LIBS $GTK_LIBS"
256 >    UISRCS=prefs_editor_gtk.cpp
257 >    WANT_GTK=gtk2
258 >  ], [
259 >    case "x${WANT_GTK}x" in
260 >    *gtkx)
261 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
262 >      WANT_GTK=gtk
263 >      ;;
264 >    *)
265 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
266 >      WANT_GTK=no
267 >      ;;
268 >    esac
269 >  ])
270 >  ;;
271 > esac
272 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
273    AM_PATH_GTK(1.2.0, [
274      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
275      CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines