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

Comparing SheepShaver/src/Unix/configure.in (file contents):
Revision 1.24 by gbeauche, 2004-05-09T17:44:17Z vs.
Revision 1.30 by gbeauche, 2004-06-27T22:12:52Z

# Line 20 | Line 20 | AC_ARG_WITH(gtk,            [  --with-gt
20   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
21   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
22  
23 + dnl SDL options.
24 + AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
25 + AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
26 +
27   dnl Checks for programs.
28   AC_PROG_CC
29   AC_PROG_CPP
# Line 86 | Line 90 | fi
90   dnl Checks for libraries.
91   AC_CHECK_LIB(posix4, sem_init)
92  
93 < dnl We need X11.
94 < AC_PATH_XTRA
95 < if [[ "x$no_x" = "xyes" ]]; then
96 <  AC_MSG_ERROR([You need X11 to run SheepShaver.])
97 < fi
98 < CFLAGS="$CFLAGS $X_CFLAGS"
99 < CXXFLAGS="$CXXFLAGS $X_CFLAGS"
100 < LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
93 > dnl Do we need SDL?
94 > WANT_SDL=no
95 > SDL_SUPPORT="none"
96 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
97 >  WANT_SDL=yes
98 >  WANT_XF86_DGA=no
99 >  WANT_XF86_VIDMODE=no
100 >  WANT_FBDEV_DGA=no
101 >  SDL_SUPPORT="video"
102 > fi
103 > if [[ "x$WANT_SDL" = "xyes" ]]; then
104 >  AC_PATH_PROG(sdl_config, "sdl-config")
105 >  if [[ -n "$sdl_config" ]]; then
106 >    sdl_cflags=`$sdl_config --cflags`
107 >    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
108 >      sdl_libs=`$sdl_config --static-libs`
109 >    else
110 >      sdl_libs=`$sdl_config --libs`
111 >    fi
112 >    CFLAGS="$CFLAGS $sdl_cflags"
113 >    CXXFLAGS="$CXXFLAGS $sdl_cflags"
114 >    LIBS="$LIBS $sdl_libs"
115 >  else
116 >    WANT_SDL=no
117 >  fi
118 > fi
119 >
120 > dnl We need X11, if not using SDL.
121 > if [[ "x$WANT_SDL" = "xno" ]]; then
122 >  AC_PATH_XTRA
123 >  if [[ "x$no_x" = "xyes" ]]; then
124 >    AC_MSG_ERROR([You need X11 to run SheepShaver.])
125 >  fi
126 >  CFLAGS="$CFLAGS $X_CFLAGS"
127 >  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
128 >  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
129 > fi
130  
131   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
132   HAVE_PTHREADS=yes
# Line 219 | Line 252 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
252   fi
253  
254   dnl Checks for library functions.
255 < AC_CHECK_FUNCS(strdup cfmakeraw)
255 > AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
256   AC_CHECK_FUNCS(nanosleep)
257   AC_CHECK_FUNCS(sigaction signal)
258   AC_CHECK_FUNCS(mmap mprotect munmap)
# Line 240 | Line 273 | no:linux*)
273    ;;
274   esac
275  
276 + dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
277 + AC_DEFUN(AC_CHECK_FRAMEWORK, [
278 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
279 +  AC_CACHE_CHECK([whether compiler supports framework $1],
280 +    ac_Framework, [
281 +    saved_LIBS="$LIBS"
282 +    LIBS="$LIBS -framework $1"
283 +    AC_TRY_LINK(
284 +      [$2], [int main(void) { return 0; }],
285 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
286 +    )
287 +  ])
288 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
289 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
290 +  )
291 +  AS_VAR_POPDEF([ac_Framework])dnl
292 + ])
293 +
294 + dnl Check for some MacOS X frameworks
295 + AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
296 + AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
297 +
298   dnl Select system-dependant sources.
299   SERIALSRC=serial_unix.cpp
300   ETHERSRC=../dummy/ether_dummy.cpp
# Line 259 | Line 314 | darwin*)
314    if [[ "x$EMULATED_PPC" = "xno" ]]; then
315      EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
316    fi
317 +  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
318 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
319 +  fi
320    ;;
321   esac
322 < SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
322 >
323 > dnl SDL overrides
324 > if [[ "x$WANT_SDL" = "xyes" ]]; then
325 >  AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
326 > fi
327 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
328 >  VIDEOSRCS="../SDL/video_sdl.cpp"
329 >  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
330 >  KEYCODES="../SDL/keycodes"
331 >  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
332 >    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
333 >  else
334 >    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
335 >  fi
336 > else
337 >  VIDEOSRCS="video_x.cpp"
338 >  KEYCODES="keycodes"
339 >  EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
340 > fi
341 >
342 > SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
343  
344   dnl Define a macro that translates a yesno-variable into a C macro definition
345   dnl to be put into the config.h file
# Line 652 | Line 730 | else
730   fi
731  
732   dnl Platform specific binary postprocessor
733 < BLESS=/bin/true
733 > AC_PATH_PROG(BLESS, "true")
734   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
735    BLESS=Darwin/lowmem
736    LDFLAGS="$LDFLAGS -pagezero_size 0x3000"
# Line 823 | Line 901 | AC_SUBST(DYNGEN_OP_FLAGS)
901   AC_SUBST(SYSSRCS)
902   AC_SUBST(CPUSRCS)
903   AC_SUBST(BLESS)
904 + AC_SUBST(KEYCODES)
905   AC_OUTPUT(Makefile)
906  
907   dnl Print summary.
908   echo
909   echo SheepShaver configuration summary:
910   echo
911 + echo SDL support ...................... : $SDL_SUPPORT
912   echo XFree86 DGA support .............. : $WANT_XF86_DGA
913   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
914   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines