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.5 by cebix, 1999-10-15T12:27:24Z vs.
Revision 1.28 by cebix, 2000-10-14T16:30:53Z

# Line 6 | Line 6 | AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
8   dnl Options.
9 < WANT_DGA=yes
10 < WANT_UI=yes
11 < AC_ARG_ENABLE(dga, [  --enable-dga            use the DGA extension (default)], [WANT_DGA=$enableval], [])
12 < AC_ARG_ENABLE(ui,  [  --enable-ui             use GTK user interface (default)], [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 > 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/-/_/' | 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 +
89 + dnl We need X11.
90   AC_PATH_XTRA
91   if [[ "x$no_x" = "xyes" ]]; then
92    AC_MSG_ERROR([You need X11 to run Basilisk II.])
93   fi
26
94   CFLAGS="$CFLAGS $X_CFLAGS"
95   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
96   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
30 STATICLIBS=
97  
98 < dnl We need pthreads.
99 < AC_CHECK_LIB(pthread, pthread_create, HAVE_PTHREADS=yes, HAVE_PTHREADS=no)
100 < if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
101 <  dnl Check even the libc_r (FreeBSD)
102 <  AC_CHECK_LIB(c_r, pthread_create, HAVE_PTHREADS=yes, HAVE_PTHREADS=no)
103 <  if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
104 <     AC_MSG_ERROR([You need libpthreads to run Basilisk II.])
105 <  else
106 <     LIBS="$LIBS -lc_r"
107 <  fi
108 < else
43 <  LIBS="$LIBS -lpthread"
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 >      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 We use DGA if possible.
113 < if [[ "x$WANT_DGA" = "xyes" ]]; then
114 <  AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, HAVE_DGA=yes, HAVE_DGA=no)
115 <  if [[ "x$HAVE_DGA" = "xno" ]]; then
116 <    AC_MSG_WARN([Could not find DGA extension, ignoring --enable-dga.])
52 <  else
53 <    DEFINES="$DEFINES -DENABLE_DGA=1"
54 <    LIBS="$LIBS -lXxf86dga"
112 > dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
113 > SEMSRC=
114 > AC_CHECK_FUNCS(sem_init, , [
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 +    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.])
127 +      WANT_FBDEV_DGA=no
128 +    fi
129 +  ], [
130 +    AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
131 +    WANT_XF86_DGA=no
132 +  ])
133 + fi
134 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
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 < if [[ "x$WANT_UI" = "xyes" ]]; then
151 <  AM_PATH_GTK(1.2.0)
152 <  if [[ "x$no_gtk" = "xyes" ]]; then
153 <    echo "Did not find gtk+, disabling user interface."
154 <    WANT_UI=no
155 <    GTK_CFLAGS=
156 <    GTK_LIBS=
157 <  else
158 <    DEFINES="$DEFINES -DENABLE_GTK=1"
159 <  fi
160 <  CFLAGS="$CFLAGS $GTK_CFLAGS"
161 <  CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
71 <  LIBS="$LIBS $GTK_LIBS"
150 > UISRCS=../dummy/prefs_editor_dummy.cpp
151 > if [[ "x$WANT_GTK" = "xyes" ]]; then
152 >  AM_PATH_GTK(1.2.0, [
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_GTK=no
161 >  ])
162   fi
163  
164 < dnl We need POSIX.4 semaphores (and other POSIX.4 blessings).
165 < SEMSRCS=
166 < AC_CHECK_FUNCS(sem_init)
167 < if [[ "x$ac_cv_func_sem_init" = "xno" ]]; then
168 <  AC_CHECK_LIB(posix4, sem_init, HAVE_LIBPOSIX4=yes, HAVE_LIBPOSIX4=no)
169 <  if [[ "x$HAVE_LIBPOSIX4" = "xno" ]]; then
170 <    dnl Emulate semaphores with pthread mutexes
171 <    SEMSRCS="posix_sem.cpp"
172 <  else
173 <    LIBS="$LIBS -lposix4"
174 <  fi
164 > dnl We use ESD if possible.
165 > if [[ "x$WANT_ESD" = "xyes" ]]; then
166 >  AM_PATH_ESD(0.2.8, [
167 >    AC_DEFINE(ENABLE_ESD)
168 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
169 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
170 >    LIBS="$LIBS $ESD_LIBS"
171 >  ], [
172 >    AC_MSG_WARN([Could not find ESD, disabling ESD support.])
173 >    WANT_ESD=no
174 >  ])
175   fi
176  
177   dnl Checks for header files.
# Line 96 | 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)
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 Linux/audio_linux.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 > CAN_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
123 <      AC_CHECK_HEADER(/sys/cam/cam.h)
124 <      if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
125 <        dnl In this case I should fix this thing including a "patch"
126 <        dnl to access directly to the functions in the kernel :) --Orlando
127 <        AC_MSG_ERROR([Cannot find kernel includes for CAM library.])
128 <      fi
129 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.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 <    ;;
236 <  FreeBSD*)
237 <    dnl Check for the SCSI library
238 <    AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
239 <    if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
240 <      AC_MSG_ERROR([Cannot find libscsi for SCSI management.])
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 <      dnl Check for the sys kernel includes
143 <      AC_CHECK_HEADER(scsi.h sys/scsiio.h)
144 <      if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
145 <        AC_MSG_ERROR([Cannot find includes for the SCSI library.])
146 <      fi
147 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
249 >      SCSISRC=FreeBSD/scsi_freebsd.cpp
250        LIBS="$LIBS -lscsi"
149      DEFINES="$DEFINES -DBSD_COMP"
251      fi
252 <    ;;
253 <  SunOS*)
254 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp Solaris/audio_solaris.cpp"
255 <    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
256 <    ;;
257 <  IRIX*)
258 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp Irix/unaligned.c"
259 <    DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
260 <    LIBS="$LIBS -lm"
252 >  fi
253 >  ;;
254 > netbsd*)
255 >  CAN_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 >  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 -lm"
266 >  ;;
267 > esac
268 >
269 > dnl Use 68k CPU natively?
270 > WANT_NATIVE_M68K=no
271 > if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
272 >  AC_DEFINE(ENABLE_NATIVE_M68K)
273 >  WANT_NATIVE_M68K=yes
274 > fi
275 >
276 > if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
277 >  dnl Serial, ethernet and audio support needs pthreads
278 >  AC_MSG_WARN([You don't have pthreads, disabling serial, ethernet and audio support.])
279 >  SERIALSRC=../dummy/serial_dummy.cpp
280 >  ETHERSRC=../dummy/ether_dummy.cpp
281 >  AUDIOSRC=../dummy/audio_dummy.cpp
282 > fi
283 > SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
284 >
285 > dnl Define a macro that translates a yesno-variable into a C macro definition
286 > dnl to be put into the config.h file
287 > dnl $1 -- the macro to define
288 > dnl $2 -- the value to translate
289 > AC_DEFUN(AC_TRANSLATE_DEFINE, [
290 >    if [[ "x$2" = "xyes" ]]; then
291 >        AC_DEFINE($1)
292 >    fi
293 > ])
294 >
295 > dnl Check if we can mmap 0x2000 bytes from 0x0000
296 > AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
297 >  ac_cv_can_map_lm, [
298 >  AC_LANG_SAVE
299 >  AC_LANG_CPLUSPLUS
300 >  AC_TRY_RUN([
301 >    #include <unistd.h>
302 >    #include <fcntl.h>
303 >    #include <sys/mman.h>
304 >    
305 >    int main()
306 >    { int zero_fd; char * lm;
307 >      if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
308 >      if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
309 >      lm[0] = 0x12;
310 >          munmap(lm, 0x2000);
311 >      close(zero_fd);
312 >      exit(0);
313 >    }
314 >  ],
315 >  [ac_cv_can_map_lm=yes],
316 >  [ac_cv_can_map_lm=no]
317 >  )
318 >  AC_LANG_RESTORE
319 >  ]
320 > )
321 >
322 > dnl Check if extended signals are supported.
323 > AC_CACHE_CHECK("whether your system supports extended signal handlers",
324 >  ac_cv_have_extended_signals, [
325 >  AC_LANG_SAVE
326 >  AC_LANG_CPLUSPLUS
327 >  AC_TRY_RUN([
328 >    #include <unistd.h>
329 >    #include <stdlib.h>
330 >    #include <signal.h>
331 >    #include <fcntl.h>
332 >    #include <sys/mman.h>
333 >
334 >    static volatile caddr_t mem = 0;
335 >    static int zero_fd = -1;
336 >
337 >    static RETSIGTYPE segfault_handler(int, siginfo_t * sip, void *)
338 >    { if ((caddr_t)(sip->si_addr) != mem) exit(1);
339 >      munmap(mem, getpagesize()); close(zero_fd); exit(0); }
340 >
341 >    int main()
342 >    { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
343 >      if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
344 >      struct sigaction sa; sa.sa_sigaction = segfault_handler; sa.sa_flags = SA_SIGINFO;
345 >      sigaction(SIGSEGV, &sa, 0);
346 >      mem[0] = 0;
347 >      exit(1); // should not be reached
348 >    }
349 >  ],
350 >  [ac_cv_have_extended_signals=yes],
351 >  [ac_cv_have_extended_signals=no]
352 >  )
353 >  AC_LANG_RESTORE
354 >  ]
355 > )
356 > AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
357 >
358 > dnl Otherwise, check for subterfuges.
359 > if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
360 >  case "$target_os" in
361 >    linux*)
362 >      if [[ "x$HAVE_I386" = "xyes" ]]; then
363 >        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
364 >                  ac_cv_have_sigcontext_hack, [
365 >          AC_LANG_SAVE
366 >          AC_LANG_CPLUSPLUS
367 >          AC_TRY_RUN([
368 >            #include <unistd.h>
369 >            #include <signal.h>
370 >            #include <fcntl.h>
371 >            #include <sys/mman.h>
372 >
373 >            static volatile caddr_t mem = 0;
374 >            static int zero_fd = -1;
375 >
376 >            static RETSIGTYPE segfault_handler(int, struct sigcontext scs)
377 >            { if ((caddr_t)(scs.cr2) != mem) exit(1);
378 >              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
379 >
380 >            int main()
381 >            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
382 >              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
383 >              struct sigaction sa; sa.sa_flags = 0;
384 >              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
385 >              sigaction(SIGSEGV, &sa, 0);
386 >              mem[0] = 0;
387 >              exit(1); // should not be reached
388 >            }
389 >          ],
390 >          [ac_cv_have_sigcontext_hack=yes],
391 >          [ac_cv_have_sigcontext_hack=no]
392 >          )
393 >          AC_LANG_RESTORE
394 >        ])
395 >        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
396 >      fi
397 >      ;;
398 >    netbsd*)
399 >      if [[ "x$HAVE_M68K" = "xyes" ]]; then
400 >        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
401 >                  ac_cv_have_sigcontext_hack, [
402 >          AC_LANG_SAVE
403 >          AC_LANG_CPLUSPLUS
404 >          AC_TRY_RUN([
405 >            #include <unistd.h>
406 >            #include <signal.h>
407 >            #include <fcntl.h>
408 >            #include <sys/mman.h>
409 >
410 >            static volatile caddr_t mem = 0;
411 >            static int zero_fd = -1;
412 >
413 >            static RETSIGTYPE segfault_handler(int, int code)
414 >            { if ((caddr_t)code != mem) exit(1);
415 >              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
416 >
417 >            int main()
418 >            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
419 >              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
420 >              struct sigaction sa; sa.sa_flags = 0;
421 >              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
422 >              sigaction(SIGSEGV, &sa, 0);
423 >              mem[0] = 0;
424 >              exit(1); // should not be reached
425 >            }
426 >          ],
427 >          [ac_cv_have_sigcontext_hack=yes],
428 >          [ac_cv_have_sigcontext_hack=no]
429 >          )
430 >          AC_LANG_RESTORE
431 >        ])
432 >        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
433 >      fi
434      ;;
435    esac
162  if [[ "x$WANT_UI" = "xyes" ]]; then
163    SYSSRCS="$SYSSRCS prefs_editor_gtk.cpp"
164  else
165    SYSSRCS="$SYSSRCS ../dummy/prefs_editor_dummy.cpp"
166  fi
436   fi
437 < if [[ "x$SEMSRCS" != "x" ]]; then
438 <  SYSSRCS="$SYSSRCS $SEMSRCS"
437 >
438 > dnl Can we do Video on SEGV Signals ?
439 > CAN_VOSF=no
440 > if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
441 >  CAN_VOSF=yes
442   fi
443  
444 < dnl Defaults for UAE CPU.
445 < CPUINCLUDES="-I../uae_cpu"
446 < 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"
444 > dnl Determine the addressing mode to use
445 > if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
446 >  ADDRESSING_MODE="real"
447 > else
448 >  ADDRESSING_MODE=""
449 >  AC_MSG_CHECKING([for the addressing mode to use])
450 >  for am in $ADDRESSING_TEST_ORDER; do
451 >    case $am in
452 >    real)
453 >      dnl Requires ability to mmap Low Memory globals.
454 >      if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
455 >        continue
456 >      fi
457 >      if [[ "x$ac_cv_c_bigendian" = "xyes" ]]; then
458 >        dnl Requires only VOSF if 16-bit vidmode enable
459 >        if [[ "x$WANT_16BIT_VIDMODE" = "xyes" ]]; then
460 >          if [[ "x$CAN_VOSF" = "xno" ]]; then
461 >            continue
462 >          fi
463 >        else
464 >          DEFINES="$DEFINES -DDISABLE_16BIT_VIDMODE"
465 >        fi
466 >      else
467 >        dnl Requires VOSF
468 >        if [[ "x$CAN_VOSF" = "xno" ]]; then
469 >          continue
470 >        fi
471 >      fi
472 >      dnl Real addressing will probably work
473 >      ADDRESSING_MODE="real"
474 >      WANT_VOSF=yes dnl we can use VOSF and we need it actually
475 >      DEFINES="$DEFINES -DREAL_ADDRESSING"
476 >      break
477 >      ;;
478 >    direct)
479 >      dnl Requires VOSF
480 >      if [[ "x$CAN_VOSF" = "xyes" ]]; then
481 >        ADDRESSING_MODE="direct"
482 >        WANT_VOSF=yes dnl we can use VOSF and we need it actually
483 >        DEFINES="$DEFINES -DDIRECT_ADDRESSING"
484 >        break
485 >      fi
486 >      ;;
487 >    banks)
488 >      dnl Default addressing mode
489 >      ADDRESSING_MODE="memory banks"
490 >      break
491 >      ;;
492 >    *)
493 >      AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
494 >    esac
495 >  done
496 >  AC_MSG_RESULT($ADDRESSING_MODE)
497 >  if [[ "x$ADDRESSING_MODE" = "x" ]]; then
498 >    AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
499 >    ADDRESSING_MODE="memory banks"
500 >  fi
501 > fi
502  
503 < dnl Check for i386.
504 < HAVE_I386=no
505 < AC_MSG_CHECKING(for x86 target CPU)
506 < AC_EGREP_CPP(yes,
507 < [
508 < #ifdef __i386__
509 <  yes
510 < #endif
511 < ], [AC_MSG_RESULT(yes); HAVE_I386=yes], AC_MSG_RESULT(no))
503 > dnl Since real and direct addressing modes automatically activate VOSF,
504 > dnl I put this test here.
505 > if [[ "x$WANT_VOSF" = "xyes" ]]; then
506 >  if [[ "x$CAN_VOSF" = "xno" ]]; then
507 >    AC_MSG_WARN([Sorry, your system does not support Video on SEGV signals])
508 >    WANT_VOSF=no
509 >  else
510 >    AC_DEFINE(ENABLE_VOSF)
511 >  fi
512 > fi
513  
514   dnl Check for GAS.
515   HAVE_GAS=no
# Line 202 | Line 530 | AC_EGREP_CPP(yes,
530   #endif
531   ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
532  
533 < dnl Set "-fomit-frame-pointer" on GCC.
534 < if [[ "x$HAVE_GCC27" = "xyes" ]]; then
533 > dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
534 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
535    CFLAGS="$CFLAGS -fomit-frame-pointer"
536    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
537   fi
538  
539   dnl Select appropriate CPU source and REGPARAM define.
540 + ASM_OPTIMIZATIONS=none
541 + CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
542 + FPUSRCS="../uae_cpu/fpp.cpp"
543   if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
544 +  dnl i386 CPU
545    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
546    if [[ "x$HAVE_GAS" = "xyes" ]]; then
547 <    DEFINES="$DEFINES -DX86_ASSEMBLY"
548 <    CPUSRCS="$CPUSRCS cpufast.s"
549 <  else
550 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
547 >    ASM_OPTIMIZATIONS=i386
548 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTFLAGS"
549 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
550 >    FPUSRCS="../uae_cpu/fpu_x86.cpp"
551    fi
552 < else
553 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
552 > elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
553 >  dnl SPARC CPU
554 >  case "$target_os" in
555 >  solaris*)
556 >    AC_MSG_CHECKING(SPARC CPU architecture)
557 >    SPARC_TYPE=`Solaris/which_sparc`
558 >    AC_MSG_RESULT($SPARC_TYPE)
559 >    case "$SPARC_TYPE" in
560 >    SPARC_V8)
561 >      ASM_OPTIMIZATIONS="SPARC V8 architecture"
562 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTFLAGS"
563 >      CFLAGS="$CFLAGS -Wa,-Av8"
564 >      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
565 >      ;;
566 >    SPARC_V9)
567 >      ASM_OPTIMIZATIONS="SPARC V9 architecture"
568 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTFLAGS"
569 >      CFLAGS="$CFLAGS -Wa,-Av9"
570 >      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
571 >      ;;
572 >    esac
573 >    ;;
574 >  esac
575 > elif [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
576 >  dnl Native m68k, no emulation
577 >  CPUINCLUDES="-I../native_cpu"
578 >  CPUSRCS="asm_support.s"
579 > fi
580 >
581 > dnl UAE CPU sources for all non-m68k-native architectures.
582 > if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
583 >  CPUINCLUDES="-I../uae_cpu"
584 >  CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS"
585 > fi
586 >
587 > dnl Remove the "-g" option if set for GCC.
588 > if [[ "x$HAVE_GCC27" = "xyes" ]]; then
589 >  dnl gb-- Probably not the cleanest way to take
590 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
591 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
592   fi
593  
594   dnl Generate Makefile.
595   AC_SUBST(DEFINES)
226 AC_SUBST(STATICLIBS)
596   AC_SUBST(SYSSRCS)
597   AC_SUBST(CPUINCLUDES)
598   AC_SUBST(CPUSRCS)
599   AC_OUTPUT(Makefile)
600 < echo "Configuration done. Now type \"make\"."
600 >
601 > dnl Print summary.
602 > echo
603 > echo Basilisk II configuration summary:
604 > echo
605 > echo XFree86 DGA support .............. : $WANT_XF86_DGA
606 > echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
607 > echo fbdev DGA support ................ : $WANT_FBDEV_DGA
608 > echo Enable video on SEGV signals ..... : $WANT_VOSF
609 > echo ESD sound support ................ : $WANT_ESD
610 > echo GTK user interface ............... : $WANT_GTK
611 > echo mon debugger support ............. : $WANT_MON
612 > echo Running m68k code natively ....... : $WANT_NATIVE_M68K
613 > echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
614 > echo Addressing mode .................. : $ADDRESSING_MODE
615 > echo
616 > echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines