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

Comparing SheepShaver/src/Windows/configure.ac (file contents):
Revision 1.1 by gbeauche, 2005-03-20T23:45:17Z vs.
Revision 1.3 by gbeauche, 2005-11-27T23:54:26Z

# Line 13 | Line 13 | AC_CANONICAL_TARGET
13  
14   dnl Options.
15   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
16 + AC_ARG_WITH(gtk,          [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
17  
18   dnl Checks for programs.
19   AC_PROG_CC
# Line 22 | Line 23 | AC_PROG_MAKE_SET
23   AC_PROG_EGREP
24   AC_PROG_LN_S
25   AC_PATH_PROG(PERL, [perl])
26 + AC_CHECK_TOOL(WINDRES, windres)
27 +
28 + dnl We use GTK+ if possible.
29 + if [[ "x$WANT_GTK" = "xyes" ]]; then
30 +  AM_PATH_GTK_2_0(1.3.15, [], [
31 +    AC_MSG_WARN([Could not find GTK+ 2.0, disabling user interface.])
32 +    WANT_GTK=no
33 +  ])
34 + fi
35 + AC_SUBST(WANT_GTK)
36  
37   dnl We use 64-bit file size support if possible.
38   AC_SYS_LARGEFILE
# Line 41 | Line 52 | AC_CHECK_SIZEOF(float, 4)
52   AC_CHECK_SIZEOF(double, 8)
53   AC_CHECK_SIZEOF(void *, 4)
54   AC_TYPE_OFF_T
55 + AC_CHECK_TYPES(loff_t)
56   AC_TYPE_SIZE_T
57  
58   dnl Checks for library functions.
# Line 129 | Line 141 | AC_CACHE_CHECK([whether we can skip inst
141      #include "../Unix/vm_alloc.cpp"
142      #include "../Unix/sigsegv.cpp"
143    ], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no,
144 <  dnl When cross-compiling, do not assume anything.
145 <  ac_cv_have_skip_instruction=no
144 >  dnl When cross-compiling, assume it works
145 >  ac_cv_have_skip_instruction="yes"
146    )
147    AC_LANG_RESTORE
148    ]
# Line 199 | Line 211 | fi
211   CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
212  
213   dnl We really want SDL for now
214 < AC_PATH_PROG(sdl_config, "sdl-config", [AC_MSG_ERROR([Sorry, you currently need SDL for this port])])
215 < sdl_cflags=`$sdl_config --cflags`
216 < sdl_libs=`$sdl_config --libs`
217 < CFLAGS="$CFLAGS $sdl_cflags"
218 < CXXFLAGS="$CXXFLAGS $sdl_cflags"
207 < LIBS="$LIBS $sdl_libs"
214 > AC_CHECK_TOOL(sdl_config, sdl-config, [AC_MSG_ERROR([Sorry, you currently need SDL for this port])])
215 > SDL_CFLAGS=`$sdl_config --cflags`
216 > AC_SUBST(SDL_CFLAGS)
217 > SDL_LIBS=`$sdl_config --libs`
218 > AC_SUBST(SDL_LIBS)
219   AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
220   AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
221   AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
# Line 228 | Line 239 | echo
239   echo SheepShaver configuration summary:
240   echo
241   echo Enable JIT compiler .............. : $WANT_JIT
242 + echo GTK user interface ............... : $WANT_GTK
243   echo
244   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines