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.41 by cebix, 2001-05-22T19:01:44Z

# 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=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
13 >
14 > dnl FPU emulation core.
15 > AC_ARG_ENABLE(fpe,
16 > [  --enable-fpe=which      specify which fpu emulator to use [default=opt]],
17 > [ case "$enableval" in
18 >    default)    FPE_CORE="default";; dnl fpu_x86.cpp if i386 architecture, fpu_uae.cpp otherwise
19 >        uae)            FPE_CORE="uae";;
20 >        *)                      AC_MSG_ERROR([--enable-fpe takes only one of the following values: default, uae]);;
21 >  esac
22 > ],
23 > [ FPE_CORE="default"
24 > ])
25 >
26 > dnl Addressing modes.
27 > AC_ARG_ENABLE(addressing,
28 > [  --enable-addressing=AM  specify the addressing mode to use [default=fastest]],
29 > [ case "$enableval" in
30 >    real)       ADDRESSING_TEST_ORDER="real";;
31 >    direct)     ADDRESSING_TEST_ORDER="direct";;
32 >    banks)      ADDRESSING_TEST_ORDER="banks";;
33 >    fastest)ADDRESSING_TEST_ORDER="direct banks";;
34 >    *)          AC_MSG_ERROR([--enable-addressing takes only one of the following values: fastest, real, direct, banks]);;
35 >  esac
36 > ],
37 > [ ADDRESSING_TEST_ORDER="direct banks"
38 > ])
39 >
40 > dnl External packages.
41 > AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
42 > AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
43 > AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
44 >
45 > dnl Canonical system information.
46 > AC_CANONICAL_HOST
47 > AC_CANONICAL_TARGET
48 >
49 > dnl Target OS type (target is host if not cross-compiling).
50 > case "$target_os" in
51 >  linux*)       OS_TYPE=linux;;
52 >  netbsd*)      OS_TYPE=netbsd;;
53 >  freebsd*)     OS_TYPE=freebsd;;
54 >  solaris*)     OS_TYPE=solaris;;
55 >  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/' | sed -e 's/\./_/'`;;
56 > esac
57 > DEFINES="$DEFINES -DOS_$OS_TYPE"
58 >
59 > dnl Target CPU type.
60 > HAVE_I386=no
61 > HAVE_M68K=no
62 > HAVE_SPARC=no
63 > HAVE_POWERPC=no
64 > case "$target_cpu" in
65 >  i386* | i486* | i586* | i686* | i786* ) CPU_TYPE=i386 HAVE_I386=yes;;
66 >  m68k* ) CPU_TYPE=m68k HAVE_M68K=yes;;
67 >  sparc* ) CPU_TYPE=sparc HAVE_SPARC=yes;;
68 >  powerpc* ) CPU_TYPE=powerpc HAVE_POWERPC=yes;;
69 >  *) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/'`;;
70 > esac
71 > DEFINES="$DEFINES -DCPU_$CPU_TYPE"
72  
73   dnl Checks for programs.
74   AC_PROG_CC
75 + AC_PROG_CC_C_O
76   AC_PROG_CPP
77   AC_PROG_CXX
78   AC_PROG_MAKE_SET
79   AC_PROG_INSTALL
80  
81 + dnl We use mon if possible.
82 + MONSRCS=
83 + if [[ "x$WANT_MON" = "xyes" ]]; then
84 +  AC_MSG_CHECKING(for mon)
85 +  mon_srcdir=../../../mon/src
86 +  if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
87 +    AC_MSG_RESULT(yes)
88 +    AC_DEFINE(ENABLE_MON)
89 +    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.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"
90 +    CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
91 +    AC_CHECK_LIB(readline, readline)
92 +    AC_CHECK_LIB(termcap, tputs)
93 +    AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
94 +  else
95 +    AC_MSG_RESULT(no)
96 +    AC_MSG_WARN([Could not find mon, ignoring --with-mon.])
97 +    WANT_MON=no
98 +  fi
99 + fi
100 +
101   dnl Checks for libraries.
102   AC_CHECK_LIB(posix4, sem_init)
103  
# Line 34 | Line 110 | CFLAGS="$CFLAGS $X_CFLAGS"
110   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
111   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
112  
113 < dnl We need pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
113 > dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
114 > HAVE_PTHREADS=yes
115   AC_CHECK_LIB(pthread, pthread_create, , [
116    AC_CHECK_LIB(c_r, pthread_create, , [
117      AC_CHECK_LIB(PTL, pthread_create, , [
118 <      AC_MSG_ERROR([You need pthreads to run Basilisk II.])
118 >      HAVE_PTHREADS=no
119      ])
120    ])
121   ])
122 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
123 +  AC_DEFINE(HAVE_PTHREADS)
124 + fi
125 + AC_CHECK_FUNCS(pthread_cancel)
126  
127   dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
128 < SEMSRCS=
128 > SEMSRC=
129   AC_CHECK_FUNCS(sem_init, , [
130 <  SEMSRCS=posix_sem.cpp
130 >  if test "x$HAVE_PTHREADS" = "xyes"; then
131 >    SEMSRC=posix_sem.cpp
132 >  fi
133   ])
134  
135   dnl We use DGA (XFree86 or fbdev) if possible.
136   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
137    AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
138 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
138 >    AC_DEFINE(ENABLE_XF86_DGA)
139      LIBS="$LIBS -lXxf86dga"
140      if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
141        AC_MSG_WARN([Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga.])
# Line 60 | Line 143 | if [[ "x$WANT_XF86_DGA" = "xyes" ]]; the
143      fi
144    ], [
145      AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
146 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
146 >    WANT_XF86_DGA=no
147    ])
65 else
66  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
148   fi
149   if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
150 <  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
151 < else
152 <  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
150 >  AC_DEFINE(ENABLE_FBDEV_DGA)
151 > fi
152 >
153 > dnl We use XFree86 VidMode if possible.
154 > if [[ "x$WANT_XF86_VIDMODE" = "xyes" ]]; then
155 >  AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, [
156 >    AC_DEFINE(ENABLE_XF86_VIDMODE)
157 >    LIBS="$LIBS -lXxf86vm"
158 >  ], [
159 >    AC_MSG_WARN([Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode.])
160 >    WANT_XF86_VIDMODE=no
161 >  ])
162   fi
163  
164   dnl We use GTK+ if possible.
165   UISRCS=../dummy/prefs_editor_dummy.cpp
166 < if [[ "x$WANT_UI" = "xyes" ]]; then
166 > if [[ "x$WANT_GTK" = "xyes" ]]; then
167    AM_PATH_GTK(1.2.0, [
168 <    DEFINES="$DEFINES -DENABLE_GTK=1"
168 >    AC_DEFINE(ENABLE_GTK)
169      CFLAGS="$CFLAGS $GTK_CFLAGS"
170      CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
171      LIBS="$LIBS $GTK_LIBS"
172      UISRCS=prefs_editor_gtk.cpp
173    ], [
174      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
175 <    WANT_UI=no
175 >    WANT_GTK=no
176    ])
177   fi
178  
179   dnl We use ESD if possible.
180   if [[ "x$WANT_ESD" = "xyes" ]]; then
181    AM_PATH_ESD(0.2.8, [
182 <    DEFINES="$DEFINES -DENABLE_ESD=1"
182 >    AC_DEFINE(ENABLE_ESD)
183      CFLAGS="$CFLAGS $ESD_CFLAGS"
184      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
185      LIBS="$LIBS $ESD_LIBS"
# Line 111 | Line 201 | AC_CHECK_SIZEOF(short, 2)
201   AC_CHECK_SIZEOF(int, 4)
202   AC_CHECK_SIZEOF(long, 4)
203   AC_CHECK_SIZEOF(long long, 8)
204 + AC_CHECK_SIZEOF(void *, 4)
205   AC_TYPE_OFF_T
206   AC_CHECK_TYPE(loff_t, off_t)
207   AC_TYPE_SIZE_T
208 + AC_TYPE_SIGNAL
209   AC_HEADER_TIME
210   AC_STRUCT_TM
211  
212   dnl Checks for library functions.
213   AC_CHECK_FUNCS(strdup cfmakeraw)
214 < AC_CHECK_FUNCS(nanosleep clock_gettime timer_create)
215 < AC_CHECK_FUNCS(pthread_cancel)
214 > AC_CHECK_FUNCS(clock_gettime timer_create)
215 > AC_CHECK_FUNCS(sigaction signal)
216  
217   dnl Select system-dependant source files.
218 < SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp"
219 < if MACHINE=`uname -a 2>/dev/null`; then
220 <  case "$MACHINE" in
221 <  Linux*)
222 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
223 <    ;;
224 <  FreeBSD*3.*)
225 <    dnl Check for the CAM library
226 <    AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
227 <    if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
228 <      AC_MSG_ERROR([Cannot find libcam for SCSI management.])
218 > SERIALSRC=serial_unix.cpp
219 > ETHERSRC=../dummy/ether_dummy.cpp
220 > SCSISRC=../dummy/scsi_dummy.cpp
221 > AUDIOSRC=../dummy/audio_dummy.cpp
222 > EXTRASYSSRCS=
223 > CAN_NATIVE_M68K=no
224 > case "$target_os" in
225 > linux*)
226 >  ETHERSRC=ether_unix.cpp
227 >  AUDIOSRC=audio_oss_esd.cpp
228 >  SCSISRC=Linux/scsi_linux.cpp
229 >  ;;
230 > freebsd*)
231 >  ETHERSRC=ether_unix.cpp
232 >  AUDIOSRC=audio_oss_esd.cpp
233 >  DEFINES="$DEFINES -DBSD_COMP"
234 >  CXXFLAGS="$CXXFLAGS -fpermissive"
235 >  dnl Check for the CAM library
236 >  AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
237 >  if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
238 >    AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
239 >  else
240 >    dnl Check for the sys kernel includes
241 >    AC_CHECK_HEADER(camlib.h)
242 >    if [[ "x$ac_cv_header_camlib_h" = "xno" ]]; then
243 >      dnl In this case I should fix this thing including a "patch"
244 >      dnl to access directly to the functions in the kernel :) --Orlando
245 >      AC_MSG_WARN([Cannot find includes for CAM library, disabling SCSI support.])
246      else
247 <      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"
146 <      CXXFLAGS="$CXXFLAGS -I/sys"
147 <      CFLAGS="$CFLAGS -I/sys"
247 >      SCSISRC=FreeBSD/scsi_freebsd.cpp
248        LIBS="$LIBS -lcam"
249 <      DEFINES="$DEFINES -DBSD_COMP -DCAM"
249 >      DEFINES="$DEFINES -DCAM"
250      fi
251 <    ;;
252 <  FreeBSD*)
253 <    dnl Check for the SCSI library
254 <    AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
255 <    if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
256 <      AC_MSG_ERROR([Cannot find libscsi for SCSI management.])
257 <    else
258 <      dnl Check for the sys kernel includes
259 <      AC_CHECK_HEADER(scsi.h sys/scsiio.h)
260 <      if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
261 <        AC_MSG_ERROR([Cannot find includes for the SCSI library.])
262 <      fi
263 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
264 <      LIBS="$LIBS -lscsi"
265 <      DEFINES="$DEFINES -DBSD_COMP"
251 >  fi
252 >  ;;
253 > netbsd*)
254 >  CAN_NATIVE_M68K=yes
255 >  ;;
256 > solaris*)
257 >  AUDIOSRC=Solaris/audio_solaris.cpp
258 >  DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
259 >  ;;
260 > irix*)
261 >  AUDIOSRC=Irix/audio_irix.cpp
262 >  EXTRASYSSRCS=Irix/unaligned.c
263 >  dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
264 >  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
265 >  LIBS="$LIBS -laudio"
266 >
267 >  dnl Check if our compiler supports -Ofast (MIPSPro)
268 >  HAVE_OFAST=no
269 >  ocflags="$CFLAGS"
270 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/-g$/ -Ofast/;s/^-g$/-Ofast/'`
271 >  AC_MSG_CHECKING(if "-Ofast" works)
272 >  dnl Do a test compile of an empty function
273 >  AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_OFAST=yes], AC_MSG_RESULT(no))
274 >  CFLAGS="$ocflags"
275 >
276 >  ;;
277 > esac
278 >
279 > dnl Use 68k CPU natively?
280 > WANT_NATIVE_M68K=no
281 > if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
282 >  AC_DEFINE(ENABLE_NATIVE_M68K)
283 >  WANT_NATIVE_M68K=yes
284 > fi
285 >
286 > if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
287 >  dnl Serial, ethernet and audio support needs pthreads
288 >  AC_MSG_WARN([You don't have pthreads, disabling serial, ethernet and audio support.])
289 >  SERIALSRC=../dummy/serial_dummy.cpp
290 >  ETHERSRC=../dummy/ether_dummy.cpp
291 >  AUDIOSRC=../dummy/audio_dummy.cpp
292 > fi
293 > SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
294 >
295 > dnl Define a macro that translates a yesno-variable into a C macro definition
296 > dnl to be put into the config.h file
297 > dnl $1 -- the macro to define
298 > dnl $2 -- the value to translate
299 > AC_DEFUN(AC_TRANSLATE_DEFINE, [
300 >    if [[ "x$2" = "xyes" ]]; then
301 >        AC_DEFINE($1)
302      fi
303 <    ;;
304 <  SunOS*)
305 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp Solaris/audio_solaris.cpp"
306 <    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
307 <    ;;
308 <  IRIX*)
309 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp Irix/unaligned.c"
310 <    DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
311 <    LIBS="$LIBS -lm"
312 <    ;;
313 <  esac
303 > ])
304 >
305 > dnl Check if we can mmap 0x2000 bytes from 0x0000
306 > AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
307 >  ac_cv_can_map_lm, [
308 >  AC_LANG_SAVE
309 >  AC_LANG_CPLUSPLUS
310 >  AC_TRY_RUN([
311 >    #include <unistd.h>
312 >    #include <fcntl.h>
313 >    #include <sys/mman.h>
314 >    
315 >    int main()
316 >    { int zero_fd; char * lm;
317 >      if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
318 >      if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
319 >      lm[0] = 0x12;
320 >          munmap(lm, 0x2000);
321 >      close(zero_fd);
322 >      exit(0);
323 >    }
324 >  ],
325 >  [ac_cv_can_map_lm=yes],
326 >  [ac_cv_can_map_lm=no]
327 >  )
328 >  AC_LANG_RESTORE
329 >  ]
330 > )
331 >
332 > dnl Check signal handlers need to be reinstalled
333 > AC_CACHE_CHECK("whether signal handlers need to be reinstalled",
334 >        ac_cv_signal_need_reinstall, [
335 >        AC_LANG_SAVE
336 >        AC_LANG_CPLUSPLUS
337 >        AC_TRY_RUN([
338 >                #include <stdlib.h>
339 >                #ifdef HAVE_UNISTD_H
340 >                #include <unistd.h>
341 >                #endif
342 >                #include <signal.h>
343 >                static int handled_signal = 0;
344 >                RETSIGTYPE sigusr1_handler(int) { handled_signal++; }
345 >                int main(void) { /* returns 0 if signals need not to be reinstalled */
346 >                        signal(SIGUSR1, sigusr1_handler); raise(SIGUSR1); raise(SIGUSR1);
347 >                        exit(handled_signal == 2);
348 >                }
349 >        ],
350 >        [ac_cv_signal_need_reinstall=yes],
351 >        [ac_cv_signal_need_reinstall=no]
352 >        )
353 >        AC_LANG_RESTORE
354 >        ]
355 > )
356 > AC_TRANSLATE_DEFINE(SIGNAL_NEED_REINSTALL, "$ac_cv_signal_need_reinstall")
357 >
358 > dnl Check if sigaction handlers need to be reinstalled
359 > AC_CACHE_CHECK("whether sigaction handlers need to be reinstalled",
360 >  ac_cv_sigaction_need_reinstall, [
361 >  AC_LANG_SAVE
362 >  AC_LANG_CPLUSPLUS
363 >  AC_TRY_RUN([
364 >    #include <stdlib.h>
365 >    #ifdef HAVE_UNISTD_H
366 >    #include <unistd.h>
367 >    #endif
368 >    #include <signal.h>
369 >    static int handled_signal = 0;
370 >    RETSIGTYPE sigusr1_handler(int) { handled_signal++; }
371 >    typedef RETSIGTYPE (*signal_handler)(int);
372 >    static signal_handler mysignal(int sig, signal_handler handler) {
373 >      struct sigaction old_sa;
374 >      struct sigaction new_sa;
375 >      new_sa.sa_handler = handler;
376 >      return ((sigaction(sig,&new_sa,&old_sa) < 0) ? SIG_IGN : old_sa.sa_handler);
377 >    }
378 >    int main(void) { /* returns 0 if signals need not to be reinstalled */
379 >      mysignal(SIGUSR1, sigusr1_handler); raise(SIGUSR1); raise(SIGUSR1);
380 >      exit(handled_signal == 2);
381 >    }
382 >  ],
383 >  [ac_cv_sigaction_need_reinstall=yes],
384 >  [ac_cv_sigaction_need_reinstall=no]
385 >  )
386 >  AC_LANG_RESTORE
387 >  ]
388 > )
389 > AC_TRANSLATE_DEFINE(SIGACTION_NEED_REINSTALL, "$ac_cv_sigaction_need_reinstall")
390 >
391 > dnl Check if extended signals are supported.
392 > AC_CACHE_CHECK("whether your system supports extended signal handlers",
393 >  ac_cv_have_extended_signals, [
394 >  AC_LANG_SAVE
395 >  AC_LANG_CPLUSPLUS
396 >  AC_TRY_RUN([
397 >    #define HAVE_SIGINFO_T 1
398 >    #define CONFIGURE_TEST
399 >    #include "sigsegv.cpp"
400 >  ],
401 >  [ac_cv_have_extended_signals=yes],
402 >  [ac_cv_have_extended_signals=no]
403 >  )
404 >  AC_LANG_RESTORE
405 >  ]
406 > )
407 > AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
408 >
409 > dnl Otherwise, check for subterfuges.
410 > if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
411 >  AC_CACHE_CHECK("whether we then have a subterfuge for your system",
412 >  ac_cv_have_sigcontext_hack, [
413 >    AC_LANG_SAVE
414 >    AC_LANG_CPLUSPLUS
415 >    AC_TRY_RUN([
416 >      #define HAVE_SIGCONTEXT_SUBTERFUGE 1
417 >      #define CONFIGURE_TEST
418 >      #include "sigsegv.cpp"
419 >    ],
420 >    [ac_cv_have_sigcontext_hack=yes],
421 >    [ac_cv_have_sigcontext_hack=no]
422 >    )
423 >    AC_LANG_RESTORE
424 >  ])
425 >  AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, "$ac_cv_have_sigcontext_hack")
426   fi
179 SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS"
427  
428 < dnl Check for i386 CPU.
429 < HAVE_I386=no
430 < AC_MSG_CHECKING(for x86 target CPU)
431 < AC_EGREP_CPP(yes,
432 < [
186 < #ifdef __i386__
187 <  yes
188 < #endif
189 < ], [AC_MSG_RESULT(yes); HAVE_I386=yes], AC_MSG_RESULT(no))
428 > dnl Can we do Video on SEGV Signals ?
429 > CAN_VOSF=no
430 > if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
431 >  CAN_VOSF=yes
432 > fi
433  
434 < dnl Check for SPARC CPU.
435 < HAVE_SPARC=no
436 < AC_MSG_CHECKING(for SPARC target CPU)
437 < AC_EGREP_CPP(yes,
438 < [
439 < #ifdef __sparc__
440 <  yes
441 < #endif
442 < ], [AC_MSG_RESULT(yes); HAVE_SPARC=yes], AC_MSG_RESULT(no))
434 > dnl Determine the addressing mode to use
435 > if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
436 >  ADDRESSING_MODE="real"
437 > else
438 >  ADDRESSING_MODE=""
439 >  AC_MSG_CHECKING([for the addressing mode to use])
440 >  for am in $ADDRESSING_TEST_ORDER; do
441 >    case $am in
442 >    real)
443 >      dnl Requires ability to mmap() Low Memory globals
444 >      if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
445 >        continue
446 >      fi
447 >          dnl Requires VOSF screen updates
448 >      if [[ "x$CAN_VOSF" = "xno" ]]; then
449 >        continue
450 >      fi
451 >      dnl Real addressing will probably work.
452 >      ADDRESSING_MODE="real"
453 >      WANT_VOSF=yes dnl we can use VOSF and we need it actually
454 >      DEFINES="$DEFINES -DREAL_ADDRESSING"
455 >      break
456 >      ;;
457 >    direct)
458 >      dnl Requires VOSF screen updates
459 >      if [[ "x$CAN_VOSF" = "xyes" ]]; then
460 >        ADDRESSING_MODE="direct"
461 >        WANT_VOSF=yes dnl we can use VOSF and we need it actually
462 >        DEFINES="$DEFINES -DDIRECT_ADDRESSING"
463 >        break
464 >      fi
465 >      ;;
466 >    banks)
467 >      dnl Default addressing mode
468 >      ADDRESSING_MODE="memory banks"
469 >      break
470 >      ;;
471 >    *)
472 >      AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
473 >    esac
474 >  done
475 >  AC_MSG_RESULT($ADDRESSING_MODE)
476 >  if [[ "x$ADDRESSING_MODE" = "x" ]]; then
477 >    AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
478 >    ADDRESSING_MODE="memory banks"
479 >  fi
480 > fi
481 >
482 > dnl Enable VOSF screen updates with this feature is requested and feasible
483 > if [[ "x$WANT_VOSF" = "xyes" -a "x$CAN_VOSF" = "xyes" ]]; then
484 >    AC_DEFINE(ENABLE_VOSF)
485 > else
486 >    WANT_VOSF=no
487 > fi
488  
489   dnl Check for GAS.
490   HAVE_GAS=no
# Line 217 | Line 505 | AC_EGREP_CPP(yes,
505   #endif
506   ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
507  
508 < dnl Set "-fomit-frame-pointer" on GCC 2.7 or higher.
509 < if [[ "x$HAVE_GCC27" = "xyes" ]]; then
508 > dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
509 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
510    CFLAGS="$CFLAGS -fomit-frame-pointer"
511    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
512   fi
513  
514   dnl Select appropriate CPU source and REGPARAM define.
515 + ASM_OPTIMIZATIONS=none
516   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
517 < if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
517 > FPUSRCS="../uae_cpu/fpu/fpu_uae.cpp"
518 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$OS_TYPE" != "xfreebsd" ]]; then
519    dnl i386 CPU
520    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
521    if [[ "x$HAVE_GAS" = "xyes" ]]; then
522 <    DEFINES="$DEFINES -DX86_ASSEMBLY"
522 >    ASM_OPTIMIZATIONS=i386
523 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DUNALIGNED_PROFITABLE -DOPTIMIZED_FLAGS"
524      CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
525 +    FPUSRCS="../uae_cpu/fpu_x86.cpp"
526    fi
527   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
528    dnl SPARC CPU
529 <  case "$MACHINE" in
530 <  SunOS*)
529 >  case "$target_os" in
530 >  solaris*)
531      AC_MSG_CHECKING(SPARC CPU architecture)
532      SPARC_TYPE=`Solaris/which_sparc`
533      AC_MSG_RESULT($SPARC_TYPE)
534      case "$SPARC_TYPE" in
535      SPARC_V8)
536 <      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
536 >      ASM_OPTIMIZATIONS="SPARC V8 architecture"
537 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTIMIZED_FLAGS"
538        CFLAGS="$CFLAGS -Wa,-Av8"
539        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
540        ;;
541      SPARC_V9)
542 <      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
542 >      ASM_OPTIMIZATIONS="SPARC V9 architecture"
543 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTIMIZED_FLAGS"
544        CFLAGS="$CFLAGS -Wa,-Av9"
545        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
546        ;;
547      esac
548      ;;
549    esac
550 + elif [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
551 +  dnl Native m68k, no emulation
552 +  CPUINCLUDES="-I../native_cpu"
553 +  CPUSRCS="asm_support.s"
554   fi
555  
556 < dnl UAE CPU sources for all architectures.
557 < CPUINCLUDES="-I../uae_cpu"
558 < 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"
556 > dnl Select appropriate FPU source.
557 > dnl 1. Optimized X86 assembly core if target is i386 architecture
558 > SAVED_DEFINES=$DEFINES
559 > if [[ "x$FPE_CORE" = "xdefault" ]]; then
560 >  if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
561 >    DEFINES="$DEFINES -DFPU_X86"
562 >    FPE_CORE_STR="i386 optimized core"
563 >    FPUSRCS="../uae_cpu/fpu/fpu_x86.cpp"
564 >  else
565 >    FPE_CORE="uae"
566 >  fi
567 > fi
568 >
569 > dnl 2. JIT-FPU only supports IEEE-based implementation.
570 > if [[ "x$WANT_JIT_FPU" = "xyes" -a "x$FPE_CORE" != "xieee" ]]; then
571 >  AC_MSG_WARN([Sorry, JIT-FPU supports only the "ieee" FPE implementation])
572 >  FPE_CORE="ieee"
573 >  dnl Restore previous variables. FPE_CORE_STR and FPUSRCS are overwritten
574 >  DEFINES=$SAVED_DEFINES
575 > fi
576 >
577 > dnl 3. Choose either IEEE-based implementation or the old UAE core
578 > if [[ "x$FPE_CORE" = "xieee" ]]; then
579 >  AC_CHECK_HEADERS(fenv.h)
580 >  AC_CHECK_FUNCS(feclearexcept fegetexceptflag feraiseexcept fesetexceptflag fetestexcept)
581 >  AC_CHECK_FUNCS(fegetround fesetround)
582 >  DEFINES="$DEFINES -DFPU_IEEE"
583 >  FPE_CORE_STR="ieee-based fpu core"
584 >  FPUSRCS="../uae_cpu/fpu/fpu_ieee.cpp"
585 > elif [[ "x$FPE_CORE" = "xuae" ]]; then
586 >  DEFINES="$DEFINES -DFPU_UAE"
587 >  FPE_CORE_STR="original uae core"
588 >  FPUSRCS="../uae_cpu/fpu/fpu_uae.cpp"
589 > fi
590 >
591 > dnl Check for certain math functions
592 > AC_CHECK_FUNCS(atanh)
593 > AC_CHECK_FUNCS(isnan isinf)             dnl C99
594 > AC_CHECK_FUNCS(isnanl isinfl)   dnl IEEE ?
595 >
596 > dnl UAE CPU sources for all non-m68k-native architectures.
597 > if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
598 >  CPUINCLUDES="-I../uae_cpu"
599 >  CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS"
600 > fi
601 >
602 > dnl Remove the "-g" option if set for GCC.
603 > if [[ "x$HAVE_GCC27" = "xyes" ]]; then
604 >  dnl gb-- Probably not the cleanest way to take
605 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
606 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
607 > fi
608 >
609 > dnl Or if we have -Ofast
610 > if [[ "x$HAVE_OFAST" = "xyes" ]]; then
611 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/-g$/ -Ofast/;s/^-g$/-Ofast/'`
612 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/ -g$/ -Ofast/;s/^-g$/-Ofast/'`
613 >  CXXFLAGS="-LANG:std $CXXFLAGS"
614 >  LDFLAGS="$LDFLAGS -Ofast"
615 > fi
616  
617   dnl Generate Makefile.
618   AC_SUBST(DEFINES)
# Line 265 | Line 620 | AC_SUBST(SYSSRCS)
620   AC_SUBST(CPUINCLUDES)
621   AC_SUBST(CPUSRCS)
622   AC_OUTPUT(Makefile)
623 < echo "Configuration done. Now type \"make\"."
623 >
624 > dnl Print summary.
625 > echo
626 > echo Basilisk II configuration summary:
627 > echo
628 > echo XFree86 DGA support .............. : $WANT_XF86_DGA
629 > echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
630 > echo fbdev DGA support ................ : $WANT_FBDEV_DGA
631 > echo Enable video on SEGV signals ..... : $WANT_VOSF
632 > echo ESD sound support ................ : $WANT_ESD
633 > echo GTK user interface ............... : $WANT_GTK
634 > echo mon debugger support ............. : $WANT_MON
635 > echo Running m68k code natively ....... : $WANT_NATIVE_M68K
636 > echo Floating-Point emulation core .... : $FPE_CORE_STR
637 > echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
638 > echo Addressing mode .................. : $ADDRESSING_MODE
639 > echo
640 > echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines