--- BasiliskII/src/Unix/configure.in	1999/10/04 21:07:18	1.2
+++ BasiliskII/src/Unix/configure.in	1999/10/25 19:01:43	1.12
@@ -6,86 +6,108 @@ AC_PREREQ(2.12)
 AC_CONFIG_HEADER(config.h)
 
 dnl Options.
-WANT_DGA=yes
-WANT_UI=yes
-AC_ARG_ENABLE(dga, [  --enable-dga            use the DGA extension (default)], [WANT_DGA=$enableval], [])
-AC_ARG_ENABLE(ui,  [  --enable-ui             use GTK user interface (default)], [WANT_UI=$enableval], [])
+AC_ARG_ENABLE(xf86-dga,  [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
+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])
+AC_ARG_ENABLE(esd,       [  --enable-esd            Enlightened Sound Daemon support [default=yes]], [WANT_ESD=$enableval], [WANT_ESD=yes])
+AC_ARG_ENABLE(ui,        [  --enable-ui             use GTK user interface [default=yes]], [WANT_UI=$enableval], [WANT_UI=yes])
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
+dnl We use mon if possible.
+MONSRCS=
+AC_MSG_CHECKING(for mon)
+if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
+  AC_MSG_RESULT(yes)
+  WANT_MON=yes
+  DEFINES="$DEFINES -DENABLE_MON=1"
+  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"
+  CXXFLAGS="$CXXFLAGS -I../../../mon/src"
+else
+  AC_MSG_RESULT(no)
+  WANT_MON=no
+  DEFINES="$DEFINES -DENABLE_MON=0"
+fi
+
 dnl Checks for libraries.
+AC_CHECK_LIB(posix4, sem_init)
+
+dnl We need X11.
 AC_PATH_XTRA
 if [[ "x$no_x" = "xyes" ]]; then
   AC_MSG_ERROR([You need X11 to run Basilisk II.])
 fi
-
 CFLAGS="$CFLAGS $X_CFLAGS"
 CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
-STATICLIBS=
 
-dnl We need pthreads.
-AC_CHECK_LIB(pthread, pthread_create, HAVE_PTHREADS=yes, HAVE_PTHREADS=no)
-if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
-  dnl Check even the libc_r (FreeBSD)
-  AC_CHECK_LIB(c_r, pthread_create, HAVE_PTHREADS=yes, HAVE_PTHREADS=no)
-  if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
-     AC_MSG_ERROR([You need libpthreads to run Basilisk II.])
-  else
-     LIBS="$LIBS -lc_r"
-  fi
-else
-  LIBS="$LIBS -lpthread"
-fi
-AC_CHECK_FUNCS(pthread_cancel)
+dnl We need pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
+AC_CHECK_LIB(pthread, pthread_create, , [
+  AC_CHECK_LIB(c_r, pthread_create, , [
+    AC_CHECK_LIB(PTL, pthread_create, , [
+      AC_MSG_ERROR([You need pthreads to run Basilisk II.])
+    ])
+  ])
+])
 
-dnl We use DGA if possible.
-if [[ "x$WANT_DGA" = "xyes" ]]; then
-  AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, HAVE_DGA=yes, HAVE_DGA=no)
-  if [[ "x$HAVE_DGA" = "xno" ]]; then
-    AC_MSG_WARN([Could not find DGA extension, ignoring --enable-dga.])
-  else
-    DEFINES="$DEFINES -DENABLE_DGA=1"
+dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
+SEMSRCS=
+AC_CHECK_FUNCS(sem_init, , [
+  SEMSRCS=posix_sem.cpp
+])
+
+dnl We use DGA (XFree86 or fbdev) if possible.
+if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
+  AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
+    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
     LIBS="$LIBS -lXxf86dga"
-  fi
+    if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
+      AC_MSG_WARN([Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga.])
+      WANT_FBDEV_DGA=no
+    fi
+  ], [
+    AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
+    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
+  ])
+else
+  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
+fi
+if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
+  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
+else
+  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
 fi
 
 dnl We use GTK+ if possible.
+UISRCS=../dummy/prefs_editor_dummy.cpp
 if [[ "x$WANT_UI" = "xyes" ]]; then
-  AM_PATH_GTK(1.2.0)
-  if [[ "x$no_gtk" = "xyes" ]]; then
-    echo "Did not find gtk+, disabling user interface."
-    WANT_UI=no
-    GTK_CFLAGS=
-    GTK_LIBS=
-  else
+  AM_PATH_GTK(1.2.0, [
     DEFINES="$DEFINES -DENABLE_GTK=1"
-  fi
-  CFLAGS="$CFLAGS $GTK_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
-  LIBS="$LIBS $GTK_LIBS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    UISRCS=prefs_editor_gtk.cpp
+  ], [
+    AC_MSG_WARN([Could not find GTK+, disabling user interface.])
+    WANT_UI=no
+  ])
 fi
 
-dnl We need POSIX.4 semaphores (and other POSIX.4 blessings).
-SEMSRCS=
-AC_CHECK_FUNCS(sem_init)
-if [[ "x$ac_cv_func_sem_init" = "xno" ]]; then
-  AC_CHECK_LIB(posix4, sem_init, HAVE_LIBPOSIX4=yes, HAVE_LIBPOSIX4=no)
-  if [[ "x$HAVE_LIBPOSIX4" = "xno" ]]; then
-    dnl Checks for the existance of semget
-    AC_CHECK_FUNCS(semget)
-    if [[ "x$ac_cv_func_semget" = "xno" ]]; then
-      AC_MSG_ERROR([You need POSIX.4 semaphores to run Basilisk II.])
-    else
-      SEMSRCS="posix_sem.cpp"
-    fi
-  else
-    LIBS="$LIBS -lposix4"
-  fi
+dnl We use ESD if possible.
+if [[ "x$WANT_ESD" = "xyes" ]]; then
+  AM_PATH_ESD(0.2.8, [
+    DEFINES="$DEFINES -DENABLE_ESD=1"
+    CFLAGS="$CFLAGS $ESD_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
+    LIBS="$LIBS $ESD_LIBS"
+  ], [
+    AC_MSG_WARN([Could not find ESD, disabling ESD support.])
+    WANT_ESD=no
+  ])
 fi
 
 dnl Checks for header files.
@@ -109,13 +131,14 @@ AC_STRUCT_TM
 dnl Checks for library functions.
 AC_CHECK_FUNCS(strdup cfmakeraw)
 AC_CHECK_FUNCS(nanosleep clock_gettime timer_create)
+AC_CHECK_FUNCS(pthread_cancel)
 
 dnl Select system-dependant source files.
 SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp"
 if MACHINE=`uname -a 2>/dev/null`; then
   case "$MACHINE" in
   Linux*)
-    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
+    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
     ;;
   FreeBSD*3.*)
     dnl Check for the CAM library
@@ -130,7 +153,7 @@ if MACHINE=`uname -a 2>/dev/null`; then
         dnl to access directly to the functions in the kernel :) --Orlando
         AC_MSG_ERROR([Cannot find kernel includes for CAM library.])
       fi
-      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
+      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
       CXXFLAGS="$CXXFLAGS -I/sys"
       CFLAGS="$CFLAGS -I/sys"
       LIBS="$LIBS -lcam"
@@ -163,21 +186,10 @@ if MACHINE=`uname -a 2>/dev/null`; then
     LIBS="$LIBS -lm"
     ;;
   esac
-  if [[ "x$WANT_UI" = "xyes" ]]; then
-    SYSSRCS="$SYSSRCS prefs_editor_gtk.cpp"
-  else
-    SYSSRCS="$SYSSRCS ../dummy/prefs_editor_dummy.cpp"
-  fi
-fi
-if [[ "x$SEMSRCS" != "x" ]]; then
-  SYSSRCS="$SYSSRCS $SEMSRCS"
 fi
+SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
 
-dnl Defaults for UAE CPU.
-CPUINCLUDES="-I../uae_cpu"
-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"
-
-dnl Check for i386.
+dnl Check for i386 CPU.
 HAVE_I386=no
 AC_MSG_CHECKING(for x86 target CPU)
 AC_EGREP_CPP(yes,
@@ -187,7 +199,17 @@ AC_EGREP_CPP(yes,
 #endif
 ], [AC_MSG_RESULT(yes); HAVE_I386=yes], AC_MSG_RESULT(no))
 
-dnl Check for GAS
+dnl Check for SPARC CPU.
+HAVE_SPARC=no
+AC_MSG_CHECKING(for SPARC target CPU)
+AC_EGREP_CPP(yes,
+[
+#ifdef __sparc__
+  yes
+#endif
+], [AC_MSG_RESULT(yes); HAVE_SPARC=yes], AC_MSG_RESULT(no))
+
+dnl Check for GAS.
 HAVE_GAS=no
 AC_MSG_CHECKING(for GAS .p2align feature)
 cat >conftest.S << EOF
@@ -197,7 +219,7 @@ EOF
 if $CC conftest.S -c -o conftest.o >/dev/null 2>&1 ; then HAVE_GAS=yes; fi
 AC_MSG_RESULT($HAVE_GAS)
 
-dnl Check for GCC 2.7 or higher
+dnl Check for GCC 2.7 or higher.
 HAVE_GCC27=no
 AC_MSG_CHECKING(for GCC 2.7 or higher)
 AC_EGREP_CPP(yes,
@@ -206,30 +228,72 @@ AC_EGREP_CPP(yes,
 #endif
 ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
 
-dnl Set "-fomit-frame-pointer" on GCC
+dnl Set "-fomit-frame-pointer" on GCC 2.7 or higher.
 if [[ "x$HAVE_GCC27" = "xyes" ]]; then
   CFLAGS="$CFLAGS -fomit-frame-pointer"
   CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
 fi
 
-dnl Select appropriate CPU source and REGPARAM define
+dnl Select appropriate CPU source and REGPARAM define.
+WANT_X86_ASSEMBLY=no
+WANT_SPARC_V8_ASSEMBLY=no
+WANT_SPARC_V9_ASSEMBLY=no
+CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
 if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
+  dnl i386 CPU
   DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
   if [[ "x$HAVE_GAS" = "xyes" ]]; then
+    WANT_X86_ASSEMBLY=yes
     DEFINES="$DEFINES -DX86_ASSEMBLY"
-    CPUSRCS="$CPUSRCS cpufast.s"
-  else
-    CPUSRCS="$CPUSRCS cpuemu.cpp"
+    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
   fi
-else
-  CPUSRCS="$CPUSRCS cpuemu.cpp"
+elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
+  dnl SPARC CPU
+  case "$MACHINE" in
+  SunOS*)
+    AC_MSG_CHECKING(SPARC CPU architecture)
+    SPARC_TYPE=`Solaris/which_sparc`
+    AC_MSG_RESULT($SPARC_TYPE)
+    case "$SPARC_TYPE" in
+    SPARC_V8)
+      WANT_SPARC_V8_ASSEMBLY=yes
+      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
+      CFLAGS="$CFLAGS -Wa,-Av8"
+      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
+      ;;
+    SPARC_V9)
+      WANT_SPARC_V9_ASSEMBLY=yes
+      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
+      CFLAGS="$CFLAGS -Wa,-Av9"
+      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
+      ;;
+    esac
+    ;;
+  esac
 fi
 
-dnl Generate Makefile
+dnl UAE CPU sources for all architectures.
+CPUINCLUDES="-I../uae_cpu"
+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"
+
+dnl Generate Makefile.
 AC_SUBST(DEFINES)
-AC_SUBST(STATICLIBS)
 AC_SUBST(SYSSRCS)
 AC_SUBST(CPUINCLUDES)
 AC_SUBST(CPUSRCS)
 AC_OUTPUT(Makefile)
+
+dnl Print summary.
+echo
+echo Basilisk II configuration summary:
+echo
+echo XFree86 DGA support .............. : $WANT_XF86_DGA
+echo fbdev DGA support ................ : $WANT_FBDEV_DGA
+echo ESD sound support ................ : $WANT_ESD
+echo GTK user interface ............... : $WANT_UI
+echo mon debugger support ............. : $WANT_MON
+echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
+echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
+echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
+echo
 echo "Configuration done. Now type \"make\"."