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

Comparing BasiliskII/src/Unix/configure.in (file contents):
Revision 1.10 by cebix, 1999-10-23T17:57:56Z vs.
Revision 1.26 by cebix, 2000-10-09T17:05:16Z

# Line 6 | Line 6 | AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
8   dnl Options.
9 < WANT_XF86_DGA=yes
10 < WANT_FBDEV_DGA=yes
11 < WANT_ESD=yes
12 < WANT_UI=yes
13 < AC_ARG_ENABLE(xf86-dga, [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [])
14 < AC_ARG_ENABLE(fbdev-dga, [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [])
15 < AC_ARG_ENABLE(esd, [  --enable-esd            Enlightened Sound Daemon support [default=yes]], [WANT_ESD=$enableval], [])
16 < AC_ARG_ENABLE(ui,  [  --enable-ui             use GTK user interface [default=yes]], [WANT_UI=$enableval], [])
9 > AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
10 > AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
11 > AC_ARG_ENABLE(fbdev-dga,     [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
12 > AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
13 > AC_ARG_ENABLE(16bit-vidmode, [  --enable-16bit-vidmode  enable 16-bit video if possible [default=yes]], [WANT_16BIT_VIDMODE=$enableval], [WANT_16BIT_VIDMODE=yes])
14 > AC_ARG_ENABLE(addressing,
15 > [  --enable-addressing=mode specify the addressing mode to use [default=fastest]],
16 > [ case "$enableval" in
17 >    real)       ADDRESSING_TEST_ORDER="real";;
18 >    direct)     ADDRESSING_TEST_ORDER="direct";;
19 >    banks)      ADDRESSING_TEST_ORDER="banks";;
20 > dnl fastest)    ADDRESSING_TEST_ORDER="real direct banks";; gb-- will enable later...
21 >    fastest)    ADDRESSING_TEST_ORDER="direct banks";;
22 >    *)          AC_MSG_ERROR([--enable-mem-addressing takes only one of the following values: fastest, real, direct, banks]);;
23 >  esac
24 > ],
25 > dnl [ ADDRESSING_TEST_ORDER="real direct banks" gb-- will probably reactivate later
26 > [ ADDRESSING_TEST_ORDER="direct banks"
27 > ])
28 > AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
29 > AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
30 > AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
31 >
32 > dnl Canonical system information.
33 > AC_CANONICAL_HOST
34 > AC_CANONICAL_TARGET
35 >
36 > dnl Target OS type (target is host if not cross-compiling).
37 > case "$target_os" in
38 >  linux*)       OS_TYPE=linux;;
39 >  netbsd*)      OS_TYPE=netbsd;;
40 >  freebsd*)     OS_TYPE=freebsd;;
41 >  solaris*)     OS_TYPE=solaris;;
42 >  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/'`;;
43 > esac
44 > DEFINES="$DEFINES -DOS_$OS_TYPE"
45 >
46 > dnl Target CPU type.
47 > HAVE_I386=no
48 > HAVE_M68K=no
49 > HAVE_SPARC=no
50 > case "$target_cpu" in
51 >  i386* | i486* | i586* | i686* | i786* ) CPU_TYPE=i386 HAVE_I386=yes;;
52 >  m68k* ) CPU_TYPE=m68k HAVE_M68K=yes;;
53 >  sparc* ) CPU_TYPE=sparc HAVE_SPARC=yes;;
54 >  *) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/'`;;
55 > esac
56 > DEFINES="$DEFINES -DCPU_$CPU_TYPE"
57  
58   dnl Checks for programs.
59   AC_PROG_CC
60 + AC_PROG_CC_C_O
61   AC_PROG_CPP
62   AC_PROG_CXX
63   AC_PROG_MAKE_SET
64   AC_PROG_INSTALL
65  
66 + dnl We use mon if possible.
67 + MONSRCS=
68 + if [[ "x$WANT_MON" = "xyes" ]]; then
69 +  AC_MSG_CHECKING(for mon)
70 +  mon_srcdir=../../../mon/src
71 +  if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
72 +    AC_MSG_RESULT(yes)
73 +    AC_DEFINE(ENABLE_MON)
74 +    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_8080.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
75 +    CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
76 +    AC_CHECK_LIB(readline, readline)
77 +    AC_CHECK_LIB(termcap, tputs)
78 +    AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
79 +  else
80 +    AC_MSG_RESULT(no)
81 +    AC_MSG_WARN([Could not find mon, ignoring --with-mon.])
82 +    WANT_MON=no
83 +  fi
84 + fi
85 +
86   dnl Checks for libraries.
87   AC_CHECK_LIB(posix4, sem_init)
88  
# Line 34 | Line 95 | CFLAGS="$CFLAGS $X_CFLAGS"
95   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
96   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
97  
98 < dnl We need pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
98 > dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
99 > HAVE_PTHREADS=yes
100   AC_CHECK_LIB(pthread, pthread_create, , [
101    AC_CHECK_LIB(c_r, pthread_create, , [
102      AC_CHECK_LIB(PTL, pthread_create, , [
103 <      AC_MSG_ERROR([You need pthreads to run Basilisk II.])
103 >      HAVE_PTHREADS=no
104      ])
105    ])
106   ])
107 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
108 +  AC_DEFINE(HAVE_PTHREADS)
109 + fi
110 + AC_CHECK_FUNCS(pthread_cancel)
111  
112   dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
113 < SEMSRCS=
113 > SEMSRC=
114   AC_CHECK_FUNCS(sem_init, , [
115 <  SEMSRCS=posix_sem.cpp
115 >  if test "x$HAVE_PTHREADS" = "xyes"; then
116 >    SEMSRC=posix_sem.cpp
117 >  fi
118   ])
119  
120   dnl We use DGA (XFree86 or fbdev) if possible.
121   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
122    AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
123 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
123 >    AC_DEFINE(ENABLE_XF86_DGA)
124      LIBS="$LIBS -lXxf86dga"
125      if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
126        AC_MSG_WARN([Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga.])
# Line 60 | Line 128 | if [[ "x$WANT_XF86_DGA" = "xyes" ]]; the
128      fi
129    ], [
130      AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
131 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
131 >    WANT_XF86_DGA=no
132    ])
65 else
66  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
133   fi
134   if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
135 <  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
136 < else
137 <  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
135 >  AC_DEFINE(ENABLE_FBDEV_DGA)
136 > fi
137 >
138 > dnl We use XFree86 VidMode if possible.
139 > if [[ "x$WANT_XF86_VIDMODE" = "xyes" ]]; then
140 >  AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, [
141 >    AC_DEFINE(ENABLE_XF86_VIDMODE)
142 >    LIBS="$LIBS -lXxf86vm"
143 >  ], [
144 >    AC_MSG_WARN([Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode.])
145 >    WANT_XF86_VIDMODE=no
146 >  ])
147   fi
148  
149   dnl We use GTK+ if possible.
150   UISRCS=../dummy/prefs_editor_dummy.cpp
151 < if [[ "x$WANT_UI" = "xyes" ]]; then
151 > if [[ "x$WANT_GTK" = "xyes" ]]; then
152    AM_PATH_GTK(1.2.0, [
153 <    DEFINES="$DEFINES -DENABLE_GTK=1"
153 >    AC_DEFINE(ENABLE_GTK)
154      CFLAGS="$CFLAGS $GTK_CFLAGS"
155      CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
156      LIBS="$LIBS $GTK_LIBS"
157      UISRCS=prefs_editor_gtk.cpp
158    ], [
159      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
160 <    WANT_UI=no
160 >    WANT_GTK=no
161    ])
162   fi
163  
164   dnl We use ESD if possible.
165   if [[ "x$WANT_ESD" = "xyes" ]]; then
166    AM_PATH_ESD(0.2.8, [
167 <    DEFINES="$DEFINES -DENABLE_ESD=1"
167 >    AC_DEFINE(ENABLE_ESD)
168      CFLAGS="$CFLAGS $ESD_CFLAGS"
169      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
170      LIBS="$LIBS $ESD_LIBS"
# Line 111 | Line 186 | AC_CHECK_SIZEOF(short, 2)
186   AC_CHECK_SIZEOF(int, 4)
187   AC_CHECK_SIZEOF(long, 4)
188   AC_CHECK_SIZEOF(long long, 8)
189 + AC_CHECK_SIZEOF(void *, 4)
190   AC_TYPE_OFF_T
191   AC_CHECK_TYPE(loff_t, off_t)
192   AC_TYPE_SIZE_T
193 + AC_TYPE_SIGNAL
194   AC_HEADER_TIME
195   AC_STRUCT_TM
196  
197   dnl Checks for library functions.
198   AC_CHECK_FUNCS(strdup cfmakeraw)
199 < AC_CHECK_FUNCS(nanosleep clock_gettime timer_create)
123 < AC_CHECK_FUNCS(pthread_cancel)
199 > AC_CHECK_FUNCS(clock_gettime timer_create)
200  
201   dnl Select system-dependant source files.
202 < SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp"
203 < if MACHINE=`uname -a 2>/dev/null`; then
204 <  case "$MACHINE" in
205 <  Linux*)
206 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
207 <    ;;
208 <  FreeBSD*3.*)
209 <    dnl Check for the CAM library
210 <    AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
211 <    if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
212 <      AC_MSG_ERROR([Cannot find libcam for SCSI management.])
202 > SERIALSRC=serial_unix.cpp
203 > ETHERSRC=../dummy/ether_dummy.cpp
204 > SCSISRC=../dummy/scsi_dummy.cpp
205 > AUDIOSRC=../dummy/audio_dummy.cpp
206 > EXTRASYSSRCS=
207 > SUPPORTS_NATIVE_M68K=no
208 > case "$target_os" in
209 > linux*)
210 >  ETHERSRC=Linux/ether_linux.cpp
211 >  SCSISRC=Linux/scsi_linux.cpp
212 >  AUDIOSRC=audio_oss_esd.cpp
213 >  ;;
214 > freebsd*3.*)
215 >  AUDIOSRC=audio_oss_esd.cpp
216 >  DEFINES="$DEFINES -DBSD_COMP"
217 >  dnl Check for the CAM library
218 >  AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
219 >  if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
220 >    AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
221 >  else
222 >    dnl Check for the sys kernel includes
223 >    AC_CHECK_HEADER(/sys/cam/cam.h)
224 >    if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
225 >      dnl In this case I should fix this thing including a "patch"
226 >      dnl to access directly to the functions in the kernel :) --Orlando
227 >      AC_MSG_WARN([Cannot find kernel includes for CAM library, disabling SCSI support.])
228      else
229 <      dnl Check for the sys kernel includes
139 <      AC_CHECK_HEADER(/sys/cam/cam.h)
140 <      if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
141 <        dnl In this case I should fix this thing including a "patch"
142 <        dnl to access directly to the functions in the kernel :) --Orlando
143 <        AC_MSG_ERROR([Cannot find kernel includes for CAM library.])
144 <      fi
145 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
229 >      SCSISRC=FreeBSD/scsi_freebsd.cpp
230        CXXFLAGS="$CXXFLAGS -I/sys"
231        CFLAGS="$CFLAGS -I/sys"
232        LIBS="$LIBS -lcam"
233 <      DEFINES="$DEFINES -DBSD_COMP -DCAM"
233 >      DEFINES="$DEFINES -DCAM"
234      fi
235 +  fi
236 +  ;;
237 + freebsd*)
238 +  DEFINES="$DEFINES -DBSD_COMP"
239 +  dnl Check for the SCSI library
240 +  AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
241 +  if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
242 +    AC_MSG_WARN([Cannot find libscsi for SCSI management, disabling SCSI support.])
243 +  else
244 +    dnl Check for the sys kernel includes
245 +    AC_CHECK_HEADER(scsi.h sys/scsiio.h)
246 +    if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
247 +      AC_MSG_WARN([Cannot find includes for the SCSI library, disabling SCSI support.])
248 +    else
249 +      SCSISRC=FreeBSD/scsi_freebsd.cpp
250 +      LIBS="$LIBS -lscsi"
251 +    fi
252 +  fi
253 +  ;;
254 + netbsd*)
255 +  SUPPORTS_NATIVE_M68K=yes
256 +  ;;
257 + solaris*)
258 +  AUDIOSRC=Solaris/audio_solaris.cpp
259 +  DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
260 +  ;;
261 + irix*)
262 +  EXTRASYSSRCS=Irix/unaligned.c
263 +  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
264 +  LIBS="$LIBS -lm"
265 +  ;;
266 + esac
267 +
268 + if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
269 +  dnl Serial, ethernet and audio support needs pthreads
270 +  AC_MSG_WARN([You don't have pthreads, disabling serial, ethernet and audio support.])
271 +  SERIALSRC=../dummy/serial_dummy.cpp
272 +  ETHERSRC=../dummy/ether_dummy.cpp
273 +  AUDIOSRC=../dummy/audio_dummy.cpp
274 + fi
275 + SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
276 +
277 + dnl Define a macro that translates a yesno-variable into a C macro definition
278 + dnl to be put into the config.h file
279 + dnl $1 -- the macro to define
280 + dnl $2 -- the value to translate
281 + AC_DEFUN(AC_TRANSLATE_DEFINE, [
282 +    if [[ "x$2" = "xyes" ]]; then
283 +        AC_DEFINE($1)
284 +    fi
285 + ])
286 +
287 + dnl Check if we can mmap 0x2000 bytes from 0x0000
288 + AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
289 +  ac_cv_can_map_lm, [
290 +  AC_LANG_SAVE
291 +  AC_LANG_CPLUSPLUS
292 +  AC_TRY_RUN([
293 +    #include <unistd.h>
294 +    #include <fcntl.h>
295 +    #include <sys/mman.h>
296 +    
297 +    int main()
298 +    { int zero_fd; char * lm;
299 +      if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
300 +      if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
301 +      lm[0] = 0x12;
302 +          munmap(lm, 0x2000);
303 +      close(zero_fd);
304 +      exit(0);
305 +    }
306 +  ],
307 +  [ac_cv_can_map_lm=yes],
308 +  [ac_cv_can_map_lm=no]
309 +  )
310 +  AC_LANG_RESTORE
311 +  ]
312 + )
313 +
314 + dnl Check if extended signals are supported.
315 + AC_CACHE_CHECK("whether your system supports extended signal handlers",
316 +  ac_cv_have_extended_signals, [
317 +  AC_LANG_SAVE
318 +  AC_LANG_CPLUSPLUS
319 +  AC_TRY_RUN([
320 +    #include <unistd.h>
321 +    #include <stdlib.h>
322 +    #include <signal.h>
323 +    #include <fcntl.h>
324 +    #include <sys/mman.h>
325 +
326 +    static volatile caddr_t mem = 0;
327 +    static int zero_fd = -1;
328 +
329 +    static RETSIGTYPE segfault_handler(int, siginfo_t * sip, void *)
330 +    { if ((caddr_t)(sip->si_addr) != mem) exit(1);
331 +      munmap(mem, getpagesize()); close(zero_fd); exit(0); }
332 +
333 +    int main()
334 +    { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
335 +      if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
336 +      struct sigaction sa; sa.sa_sigaction = segfault_handler; sa.sa_flags = SA_SIGINFO;
337 +      sigaction(SIGSEGV, &sa, 0);
338 +      mem[0] = 0;
339 +      exit(1); // should not be reached
340 +    }
341 +  ],
342 +  [ac_cv_have_extended_signals=yes],
343 +  [ac_cv_have_extended_signals=no]
344 +  )
345 +  AC_LANG_RESTORE
346 +  ]
347 + )
348 + AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
349 +
350 + dnl Otherwise, check for subterfuges.
351 + if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
352 +  case "$target_os" in
353 +    linux*)
354 +      if [[ "x$HAVE_I386" = "xyes" ]]; then
355 +        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
356 +                  ac_cv_have_sigcontext_hack, [
357 +          AC_LANG_SAVE
358 +          AC_LANG_CPLUSPLUS
359 +          AC_TRY_RUN([
360 +            #include <unistd.h>
361 +            #include <signal.h>
362 +            #include <fcntl.h>
363 +            #include <sys/mman.h>
364 +
365 +            static volatile caddr_t mem = 0;
366 +            static int zero_fd = -1;
367 +
368 +            static RETSIGTYPE segfault_handler(int, struct sigcontext scs)
369 +            { if ((caddr_t)(scs.cr2) != mem) exit(1);
370 +              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
371 +
372 +            int main()
373 +            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
374 +              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
375 +              struct sigaction sa; sa.sa_flags = 0;
376 +              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
377 +              sigaction(SIGSEGV, &sa, 0);
378 +              mem[0] = 0;
379 +              exit(1); // should not be reached
380 +            }
381 +          ],
382 +          [ac_cv_have_sigcontext_hack=yes],
383 +          [ac_cv_have_sigcontext_hack=no]
384 +          )
385 +          AC_LANG_RESTORE
386 +        ])
387 +        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
388 +      fi
389      ;;
390 <  FreeBSD*)
391 <    dnl Check for the SCSI library
392 <    AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
393 <    if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
394 <      AC_MSG_ERROR([Cannot find libscsi for SCSI management.])
390 >  esac
391 > fi
392 >
393 > dnl Can we do Video on SEGV Signals ?
394 > CAN_VOSF=no
395 > if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
396 >  CAN_VOSF=yes
397 > fi
398 >
399 > dnl Determine the addressing mode to use
400 > ADDRESSING_MODE=""
401 > AC_MSG_CHECKING([for the addressing mode to use])
402 > for am in $ADDRESSING_TEST_ORDER; do
403 >  case $am in
404 >  real)
405 >    dnl Requires ability to mmap Low Memory globals.
406 >    if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
407 >      continue
408 >    fi
409 >    if [[ "x$ac_cv_c_bigendian" = "xyes" ]]; then
410 >      dnl Requires only VOSF if 16-bit vidmode enable
411 >      if [[ "x$WANT_16BIT_VIDMODE" = "xyes" ]]; then
412 >        if [[ "x$CAN_VOSF" = "xno" ]]; then
413 >          continue
414 >        fi
415 >      else
416 >        DEFINES="$DEFINES -DDISABLE_16BIT_VIDMODE"
417 >      fi
418      else
419 <      dnl Check for the sys kernel includes
420 <      AC_CHECK_HEADER(scsi.h sys/scsiio.h)
421 <      if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
161 <        AC_MSG_ERROR([Cannot find includes for the SCSI library.])
419 >      dnl Requires VOSF
420 >      if [[ "x$CAN_VOSF" = "xno" ]]; then
421 >        continue
422        fi
163      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
164      LIBS="$LIBS -lscsi"
165      DEFINES="$DEFINES -DBSD_COMP"
423      fi
424 +    dnl Real addressing will probably work
425 +    ADDRESSING_MODE="real"
426 +    WANT_VOSF=yes dnl we can use VOSF and we need it actually
427 +    DEFINES="$DEFINES -DREAL_ADDRESSING"
428 +    break
429      ;;
430 <  SunOS*)
431 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp Solaris/audio_solaris.cpp"
432 <    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
430 >  direct)
431 >    dnl Requires VOSF
432 >    if [[ "x$CAN_VOSF" = "xyes" ]]; then
433 >      ADDRESSING_MODE="direct"
434 >      WANT_VOSF=yes dnl we can use VOSF and we need it actually
435 >      DEFINES="$DEFINES -DDIRECT_ADDRESSING"
436 >      break
437 >    fi
438      ;;
439 <  IRIX*)
440 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp Irix/unaligned.c"
441 <    DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
442 <    LIBS="$LIBS -lm"
439 >  banks)
440 >    dnl Default addressing mode
441 >    ADDRESSING_MODE="memory banks"
442 >    break
443      ;;
444 +  *)
445 +    AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
446    esac
447 + done
448 + AC_MSG_RESULT($ADDRESSING_MODE)
449 + if [[ "x$ADDRESSING_MODE" = "x" ]]; then
450 +  AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
451 +  ADDRESSING_MODE="memory banks"
452   fi
179 SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS"
180
181 dnl Check for i386 CPU.
182 HAVE_I386=no
183 AC_MSG_CHECKING(for x86 target CPU)
184 AC_EGREP_CPP(yes,
185 [
186 #ifdef __i386__
187  yes
188 #endif
189 ], [AC_MSG_RESULT(yes); HAVE_I386=yes], AC_MSG_RESULT(no))
453  
454 < dnl Check for SPARC CPU.
455 < HAVE_SPARC=no
456 < AC_MSG_CHECKING(for SPARC target CPU)
457 < AC_EGREP_CPP(yes,
458 < [
459 < #ifdef __sparc__
460 <  yes
461 < #endif
462 < ], [AC_MSG_RESULT(yes); HAVE_SPARC=yes], AC_MSG_RESULT(no))
454 > dnl Since real and direct addressing modes automatically activate VOSF,
455 > dnl I put this test here.
456 > if [[ "x$WANT_VOSF" = "xyes" ]]; then
457 >  if [[ "x$CAN_VOSF" = "xno" ]]; then
458 >    AC_MSG_WARN([Sorry, your system does not support Video on SEGV signals])
459 >    WANT_VOSF=no
460 >  else
461 >    AC_DEFINE(ENABLE_VOSF)
462 >  fi
463 > fi
464  
465   dnl Check for GAS.
466   HAVE_GAS=no
# Line 217 | Line 481 | AC_EGREP_CPP(yes,
481   #endif
482   ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
483  
484 < dnl Set "-fomit-frame-pointer" on GCC 2.7 or higher.
485 < if [[ "x$HAVE_GCC27" = "xyes" ]]; then
484 > dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
485 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
486    CFLAGS="$CFLAGS -fomit-frame-pointer"
487    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
488   fi
489  
490   dnl Select appropriate CPU source and REGPARAM define.
491 + ASM_OPTIMIZATIONS=none
492 + WANT_NATIVE_M68K=no
493   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
494 + FPUSRCS="../uae_cpu/fpp.cpp"
495   if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
496    dnl i386 CPU
497    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
498    if [[ "x$HAVE_GAS" = "xyes" ]]; then
499 <    DEFINES="$DEFINES -DX86_ASSEMBLY"
500 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
499 >    ASM_OPTIMIZATIONS=i386
500 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTFLAGS"
501 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
502 >    FPUSRCS="../uae_cpu/fpu_x86.cpp"
503    fi
504   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
505    dnl SPARC CPU
506 <  case "$MACHINE" in
507 <  SunOS*)
506 >  case "$target_os" in
507 >  solaris*)
508      AC_MSG_CHECKING(SPARC CPU architecture)
509      SPARC_TYPE=`Solaris/which_sparc`
510      AC_MSG_RESULT($SPARC_TYPE)
511      case "$SPARC_TYPE" in
512      SPARC_V8)
513 <      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
513 >      ASM_OPTIMIZATIONS="SPARC V8 architecture"
514 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTFLAGS"
515        CFLAGS="$CFLAGS -Wa,-Av8"
516        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
517        ;;
518      SPARC_V9)
519 <      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
519 >      ASM_OPTIMIZATIONS="SPARC V9 architecture"
520 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTFLAGS"
521        CFLAGS="$CFLAGS -Wa,-Av9"
522        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
523        ;;
524      esac
525      ;;
526    esac
527 + elif [[ "x$HAVE_M68K" = "xyes" -a "x$SUPPORTS_NATIVE_M68K" = "xyes" ]]; then
528 +  dnl Native m68k, no emulation
529 +  CPUSRCS=""
530 +  AC_DEFINE(ENABLE_NATIVE_M68K)
531 +  WANT_NATIVE_M68K=yes
532   fi
533  
534 < dnl UAE CPU sources for all architectures.
535 < CPUINCLUDES="-I../uae_cpu"
536 < CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp $CPUSRCS"
534 > dnl UAE CPU sources for all non-m68k-native architectures.
535 > if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
536 >  CPUINCLUDES="-I../uae_cpu"
537 >  CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS"
538 > else
539 >  CPUINCLUDES="-I../native_cpu"
540 >  CPUSRCS="asm_support.s"
541 > fi
542 >
543 > dnl Remove the "-g" option if set for GCC.
544 > if [[ "x$HAVE_GCC27" = "xyes" ]]; then
545 >  dnl gb-- Probably not the cleanest way to take
546 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
547 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
548 > fi
549  
550   dnl Generate Makefile.
551   AC_SUBST(DEFINES)
# Line 265 | Line 553 | AC_SUBST(SYSSRCS)
553   AC_SUBST(CPUINCLUDES)
554   AC_SUBST(CPUSRCS)
555   AC_OUTPUT(Makefile)
556 < echo "Configuration done. Now type \"make\"."
556 >
557 > dnl Print summary.
558 > echo
559 > echo Basilisk II configuration summary:
560 > echo
561 > echo XFree86 DGA support .............. : $WANT_XF86_DGA
562 > echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
563 > echo fbdev DGA support ................ : $WANT_FBDEV_DGA
564 > echo Enable video on SEGV signals ..... : $WANT_VOSF
565 > echo ESD sound support ................ : $WANT_ESD
566 > echo GTK user interface ............... : $WANT_GTK
567 > echo mon debugger support ............. : $WANT_MON
568 > echo Running m68k code natively ....... : $WANT_NATIVE_M68K
569 > echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
570 > echo Addressing mode .................. : $ADDRESSING_MODE
571 > echo
572 > echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines