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.55 by gbeauche, 2006-07-16T12:47:38Z vs.
Revision 1.56 by asvitkine, 2007-01-24T14:33:52Z

# Line 245 | Line 245 | dnl We use GTK+ if possible.
245   UISRCS=../dummy/prefs_editor_dummy.cpp
246   case "x$WANT_GTK" in
247   xgtk2*)
248 +  WANT_GTK=no
249 +  ifdef([AM_PATH_GTK_2_0],
250    AM_PATH_GTK_2_0(1.3.15, [
251      GUI_CFLAGS="$GTK_CFLAGS"
252      GUI_LIBS="$GTK_LIBS"
# Line 258 | Line 260 | xgtk2*)
260      *)
261        AC_MSG_WARN([Could not find GTK+, disabling user interface.])
262        WANT_GTK=no
263 <      ;;
263 >     ;;
264      esac
265 <  ])
264 <  ;;
265 >  ]))
266   esac
267   if [[ "x$WANT_GTK" = "xgtk" ]]; then
268 +  WANT_GTK=no
269 +  ifdef([AM_PATH_GTK],
270    AM_PATH_GTK(1.2.0, [
271      GUI_CFLAGS="$GTK_CFLAGS"
272      GUI_LIBS="$GTK_LIBS"
273 +    WANT_GTK=gtk
274    ], [
275      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
276 <    WANT_GTK=no
273 <  ])
276 >  ]))
277   fi
278   if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
279    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
# Line 290 | Line 293 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
293  
294   dnl We use ESD if possible.
295   if [[ "x$WANT_ESD" = "xyes" ]]; then
296 +  WANT_ESD=no
297 +  ifdef([AM_PATH_ESD],
298    AM_PATH_ESD(0.2.8, [
299      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
300      CFLAGS="$CFLAGS $ESD_CFLAGS"
301      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
302      LIBS="$LIBS $ESD_LIBS"
303 +    WANT_ESD=yes
304    ], [
305      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
306 <    WANT_ESD=no
301 <  ])
306 >  ]))
307   fi
308  
309   dnl We use 64-bit file size support if possible.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines