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.16 by cebix, 1999-11-03T10:56:28Z vs.
Revision 1.27 by cebix, 2000-10-11T17:55:06Z

# Line 6 | Line 6 | AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
8   dnl Options.
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(fbdev-dga, [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
11 < AC_ARG_WITH(esd,       [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
12 < AC_ARG_WITH(gtk,       [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
13 < AC_ARG_WITH(mon,       [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
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/-/_/'`;;
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
# Line 21 | Line 65 | AC_PROG_INSTALL
65  
66   dnl We use mon if possible.
67   MONSRCS=
68 < AC_MSG_CHECKING(for mon)
69 < if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
70 <  AC_MSG_RESULT(yes)
71 <  WANT_MON=yes
72 <  DEFINES="$DEFINES -DENABLE_MON=1"
73 <  MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
74 <  CXXFLAGS="$CXXFLAGS -I../../../mon/src"
75 <  AC_CHECK_LIB(readline, readline)
76 <  AC_CHECK_HEADERS(readline/readline.h readline/history.h)
77 < else
78 <  AC_MSG_RESULT(no)
79 <  WANT_MON=no
80 <  DEFINES="$DEFINES -DENABLE_MON=0"
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.
# Line 48 | 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 75 | Line 129 | if [[ "x$WANT_XF86_DGA" = "xyes" ]]; the
129    ], [
130      AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
131      WANT_XF86_DGA=no
78    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
132    ])
80 else
81  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_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"
# Line 98 | Line 158 | if [[ "x$WANT_GTK" = "xyes" ]]; then
158    ], [
159      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
160      WANT_GTK=no
101    DEFINES="$DEFINES -DENABLE_GTK=0"
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"
171    ], [
172      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
173      WANT_ESD=no
115    DEFINES="$DEFINES -DENABLE_ESD=0"
174    ])
175   fi
176  
# Line 128 | 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)
140 < 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 > 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
156 <      AC_CHECK_HEADER(/sys/cam/cam.h)
157 <      if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
158 <        dnl In this case I should fix this thing including a "patch"
159 <        dnl to access directly to the functions in the kernel :) --Orlando
160 <        AC_MSG_ERROR([Cannot find kernel includes for CAM library.])
161 <      fi
162 <      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 <    ;;
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
176 <      AC_CHECK_HEADER(scsi.h sys/scsiio.h)
177 <      if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
178 <        AC_MSG_ERROR([Cannot find includes for the SCSI library.])
179 <      fi
180 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
249 >      SCSISRC=FreeBSD/scsi_freebsd.cpp
250        LIBS="$LIBS -lscsi"
182      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 >  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
264 >  LIBS="$LIBS -lm"
265 >  ;;
266 > esac
267 >
268 > dnl Use 68k CPU natively?
269 > WANT_NATIVE_M68K=no
270 > if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
271 >  AC_DEFINE(ENABLE_NATIVE_M68K)
272 >  WANT_NATIVE_M68K=yes
273 > fi
274 >
275 > if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
276 >  dnl Serial, ethernet and audio support needs pthreads
277 >  AC_MSG_WARN([You don't have pthreads, disabling serial, ethernet and audio support.])
278 >  SERIALSRC=../dummy/serial_dummy.cpp
279 >  ETHERSRC=../dummy/ether_dummy.cpp
280 >  AUDIOSRC=../dummy/audio_dummy.cpp
281 > fi
282 > SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
283 >
284 > dnl Define a macro that translates a yesno-variable into a C macro definition
285 > dnl to be put into the config.h file
286 > dnl $1 -- the macro to define
287 > dnl $2 -- the value to translate
288 > AC_DEFUN(AC_TRANSLATE_DEFINE, [
289 >    if [[ "x$2" = "xyes" ]]; then
290 >        AC_DEFINE($1)
291 >    fi
292 > ])
293 >
294 > dnl Check if we can mmap 0x2000 bytes from 0x0000
295 > AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
296 >  ac_cv_can_map_lm, [
297 >  AC_LANG_SAVE
298 >  AC_LANG_CPLUSPLUS
299 >  AC_TRY_RUN([
300 >    #include <unistd.h>
301 >    #include <fcntl.h>
302 >    #include <sys/mman.h>
303 >    
304 >    int main()
305 >    { int zero_fd; char * lm;
306 >      if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
307 >      if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
308 >      lm[0] = 0x12;
309 >          munmap(lm, 0x2000);
310 >      close(zero_fd);
311 >      exit(0);
312 >    }
313 >  ],
314 >  [ac_cv_can_map_lm=yes],
315 >  [ac_cv_can_map_lm=no]
316 >  )
317 >  AC_LANG_RESTORE
318 >  ]
319 > )
320 >
321 > dnl Check if extended signals are supported.
322 > AC_CACHE_CHECK("whether your system supports extended signal handlers",
323 >  ac_cv_have_extended_signals, [
324 >  AC_LANG_SAVE
325 >  AC_LANG_CPLUSPLUS
326 >  AC_TRY_RUN([
327 >    #include <unistd.h>
328 >    #include <stdlib.h>
329 >    #include <signal.h>
330 >    #include <fcntl.h>
331 >    #include <sys/mman.h>
332 >
333 >    static volatile caddr_t mem = 0;
334 >    static int zero_fd = -1;
335 >
336 >    static RETSIGTYPE segfault_handler(int, siginfo_t * sip, void *)
337 >    { if ((caddr_t)(sip->si_addr) != mem) exit(1);
338 >      munmap(mem, getpagesize()); close(zero_fd); exit(0); }
339 >
340 >    int main()
341 >    { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
342 >      if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
343 >      struct sigaction sa; sa.sa_sigaction = segfault_handler; sa.sa_flags = SA_SIGINFO;
344 >      sigaction(SIGSEGV, &sa, 0);
345 >      mem[0] = 0;
346 >      exit(1); // should not be reached
347 >    }
348 >  ],
349 >  [ac_cv_have_extended_signals=yes],
350 >  [ac_cv_have_extended_signals=no]
351 >  )
352 >  AC_LANG_RESTORE
353 >  ]
354 > )
355 > AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
356 >
357 > dnl Otherwise, check for subterfuges.
358 > if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
359 >  case "$target_os" in
360 >    linux*)
361 >      if [[ "x$HAVE_I386" = "xyes" ]]; then
362 >        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
363 >                  ac_cv_have_sigcontext_hack, [
364 >          AC_LANG_SAVE
365 >          AC_LANG_CPLUSPLUS
366 >          AC_TRY_RUN([
367 >            #include <unistd.h>
368 >            #include <signal.h>
369 >            #include <fcntl.h>
370 >            #include <sys/mman.h>
371 >
372 >            static volatile caddr_t mem = 0;
373 >            static int zero_fd = -1;
374 >
375 >            static RETSIGTYPE segfault_handler(int, struct sigcontext scs)
376 >            { if ((caddr_t)(scs.cr2) != mem) exit(1);
377 >              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
378 >
379 >            int main()
380 >            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
381 >              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
382 >              struct sigaction sa; sa.sa_flags = 0;
383 >              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
384 >              sigaction(SIGSEGV, &sa, 0);
385 >              mem[0] = 0;
386 >              exit(1); // should not be reached
387 >            }
388 >          ],
389 >          [ac_cv_have_sigcontext_hack=yes],
390 >          [ac_cv_have_sigcontext_hack=no]
391 >          )
392 >          AC_LANG_RESTORE
393 >        ])
394 >        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
395 >      fi
396 >      ;;
397 >    netbsd*)
398 >      if [[ "x$HAVE_M68K" = "xyes" ]]; then
399 >        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
400 >                  ac_cv_have_sigcontext_hack, [
401 >          AC_LANG_SAVE
402 >          AC_LANG_CPLUSPLUS
403 >          AC_TRY_RUN([
404 >            #include <unistd.h>
405 >            #include <signal.h>
406 >            #include <fcntl.h>
407 >            #include <sys/mman.h>
408 >
409 >            static volatile caddr_t mem = 0;
410 >            static int zero_fd = -1;
411 >
412 >            static RETSIGTYPE segfault_handler(int, int code)
413 >            { if ((caddr_t)code != mem) exit(1);
414 >              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
415 >
416 >            int main()
417 >            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
418 >              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
419 >              struct sigaction sa; sa.sa_flags = 0;
420 >              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
421 >              sigaction(SIGSEGV, &sa, 0);
422 >              mem[0] = 0;
423 >              exit(1); // should not be reached
424 >            }
425 >          ],
426 >          [ac_cv_have_sigcontext_hack=yes],
427 >          [ac_cv_have_sigcontext_hack=no]
428 >          )
429 >          AC_LANG_RESTORE
430 >        ])
431 >        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
432 >      fi
433      ;;
434    esac
435   fi
196 SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
436  
437 < dnl Check for i386 CPU.
438 < HAVE_I386=no
439 < AC_MSG_CHECKING(for x86 target CPU)
440 < AC_EGREP_CPP(yes,
441 < [
203 < #ifdef __i386__
204 <  yes
205 < #endif
206 < ], [AC_MSG_RESULT(yes); HAVE_I386=yes], AC_MSG_RESULT(no))
437 > dnl Can we do Video on SEGV Signals ?
438 > CAN_VOSF=no
439 > if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
440 >  CAN_VOSF=yes
441 > fi
442  
443 < dnl Check for SPARC CPU.
444 < HAVE_SPARC=no
445 < AC_MSG_CHECKING(for SPARC target CPU)
446 < AC_EGREP_CPP(yes,
447 < [
448 < #ifdef __sparc__
449 <  yes
450 < #endif
451 < ], [AC_MSG_RESULT(yes); HAVE_SPARC=yes], AC_MSG_RESULT(no))
443 > dnl Determine the addressing mode to use
444 > if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
445 >  ADDRESSING_MODE="real"
446 > else
447 >  ADDRESSING_MODE=""
448 >  AC_MSG_CHECKING([for the addressing mode to use])
449 >  for am in $ADDRESSING_TEST_ORDER; do
450 >    case $am in
451 >    real)
452 >      dnl Requires ability to mmap Low Memory globals.
453 >      if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
454 >        continue
455 >      fi
456 >      if [[ "x$ac_cv_c_bigendian" = "xyes" ]]; then
457 >        dnl Requires only VOSF if 16-bit vidmode enable
458 >        if [[ "x$WANT_16BIT_VIDMODE" = "xyes" ]]; then
459 >          if [[ "x$CAN_VOSF" = "xno" ]]; then
460 >            continue
461 >          fi
462 >        else
463 >          DEFINES="$DEFINES -DDISABLE_16BIT_VIDMODE"
464 >        fi
465 >      else
466 >        dnl Requires VOSF
467 >        if [[ "x$CAN_VOSF" = "xno" ]]; then
468 >          continue
469 >        fi
470 >      fi
471 >      dnl Real addressing will probably work
472 >      ADDRESSING_MODE="real"
473 >      WANT_VOSF=yes dnl we can use VOSF and we need it actually
474 >      DEFINES="$DEFINES -DREAL_ADDRESSING"
475 >      break
476 >      ;;
477 >    direct)
478 >      dnl Requires VOSF
479 >      if [[ "x$CAN_VOSF" = "xyes" ]]; then
480 >        ADDRESSING_MODE="direct"
481 >        WANT_VOSF=yes dnl we can use VOSF and we need it actually
482 >        DEFINES="$DEFINES -DDIRECT_ADDRESSING"
483 >        break
484 >      fi
485 >      ;;
486 >    banks)
487 >      dnl Default addressing mode
488 >      ADDRESSING_MODE="memory banks"
489 >      break
490 >      ;;
491 >    *)
492 >      AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
493 >    esac
494 >  done
495 >  AC_MSG_RESULT($ADDRESSING_MODE)
496 >  if [[ "x$ADDRESSING_MODE" = "x" ]]; then
497 >    AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
498 >    ADDRESSING_MODE="memory banks"
499 >  fi
500 > fi
501 >
502 > dnl Since real and direct addressing modes automatically activate VOSF,
503 > dnl I put this test here.
504 > if [[ "x$WANT_VOSF" = "xyes" ]]; then
505 >  if [[ "x$CAN_VOSF" = "xno" ]]; then
506 >    AC_MSG_WARN([Sorry, your system does not support Video on SEGV signals])
507 >    WANT_VOSF=no
508 >  else
509 >    AC_DEFINE(ENABLE_VOSF)
510 >  fi
511 > fi
512  
513   dnl Check for GAS.
514   HAVE_GAS=no
# Line 234 | Line 529 | AC_EGREP_CPP(yes,
529   #endif
530   ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
531  
532 < dnl Set "-fomit-frame-pointer" on GCC 2.7 or higher.
533 < if [[ "x$HAVE_GCC27" = "xyes" ]]; then
532 > dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
533 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
534    CFLAGS="$CFLAGS -fomit-frame-pointer"
535    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
536   fi
537  
538   dnl Select appropriate CPU source and REGPARAM define.
539 < WANT_X86_ASSEMBLY=no
245 < WANT_SPARC_V8_ASSEMBLY=no
246 < WANT_SPARC_V9_ASSEMBLY=no
539 > ASM_OPTIMIZATIONS=none
540   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
541 + FPUSRCS="../uae_cpu/fpp.cpp"
542   if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
543    dnl i386 CPU
544    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
545    if [[ "x$HAVE_GAS" = "xyes" ]]; then
546 <    WANT_X86_ASSEMBLY=yes
547 <    DEFINES="$DEFINES -DX86_ASSEMBLY"
546 >    ASM_OPTIMIZATIONS=i386
547 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTFLAGS"
548      CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
549 +    FPUSRCS="../uae_cpu/fpu_x86.cpp"
550    fi
551   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
552    dnl SPARC CPU
553 <  case "$MACHINE" in
554 <  SunOS*)
553 >  case "$target_os" in
554 >  solaris*)
555      AC_MSG_CHECKING(SPARC CPU architecture)
556      SPARC_TYPE=`Solaris/which_sparc`
557      AC_MSG_RESULT($SPARC_TYPE)
558      case "$SPARC_TYPE" in
559      SPARC_V8)
560 <      WANT_SPARC_V8_ASSEMBLY=yes
561 <      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
560 >      ASM_OPTIMIZATIONS="SPARC V8 architecture"
561 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTFLAGS"
562        CFLAGS="$CFLAGS -Wa,-Av8"
563        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
564        ;;
565      SPARC_V9)
566 <      WANT_SPARC_V9_ASSEMBLY=yes
567 <      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
566 >      ASM_OPTIMIZATIONS="SPARC V9 architecture"
567 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTFLAGS"
568        CFLAGS="$CFLAGS -Wa,-Av9"
569        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
570        ;;
571      esac
572      ;;
573    esac
574 + elif [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
575 +  dnl Native m68k, no emulation
576 +  CPUINCLUDES="-I../native_cpu"
577 +  CPUSRCS="asm_support.s"
578   fi
579  
580 < dnl UAE CPU sources for all architectures.
581 < CPUINCLUDES="-I../uae_cpu"
582 < 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"
580 > dnl UAE CPU sources for all non-m68k-native architectures.
581 > if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
582 >  CPUINCLUDES="-I../uae_cpu"
583 >  CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS"
584 > fi
585 >
586 > dnl Remove the "-g" option if set for GCC.
587 > if [[ "x$HAVE_GCC27" = "xyes" ]]; then
588 >  dnl gb-- Probably not the cleanest way to take
589 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
590 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
591 > fi
592  
593   dnl Generate Makefile.
594   AC_SUBST(DEFINES)
# Line 294 | Line 602 | echo
602   echo Basilisk II configuration summary:
603   echo
604   echo XFree86 DGA support .............. : $WANT_XF86_DGA
605 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
606   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
607 + echo Enable video on SEGV signals ..... : $WANT_VOSF
608   echo ESD sound support ................ : $WANT_ESD
609   echo GTK user interface ............... : $WANT_GTK
610   echo mon debugger support ............. : $WANT_MON
611 < echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
612 < echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
613 < echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
611 > echo Running m68k code natively ....... : $WANT_NATIVE_M68K
612 > echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
613 > echo Addressing mode .................. : $ADDRESSING_MODE
614   echo
615 < echo "Configuration done. Now type \"make\"."
615 > echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines