Merge branch 'svn/trunk' r4288

INSTALL

@@ -1,14 +1,14 @@
 DOSBox uses the following libraries:
 
-SDL 
-    The Simple DirectMedia Library available at http://www.libsdl.org
+SDL
+    The Simple DirectMedia Library available at https://www.libsdl.org/
     The dll distributed with the windows version of DOSBox is slightly
     modified. You can find the changes in the sourcepackage of DOSBox
     (src/platform/sdl-win32.diff). If you want the patched sourcetree
     send us an email. (see README)
-    Licensed under LGPL
     Note that only version 1.2 and its subversions (1.2.8, 1.2.13 etc.)
     are currently supported.
+    License: LGPLv2+
 
 Opusfile, by Xiph
     For compressed audio tracks (.opus) used with CDROM images.
@@ -32,24 +32,25 @@ SpeexDSP, by Xiph
 Curses (optional)
     If you want to enable the debugger you need a curses library.
     ncurses should be installed on just about every unix distro.
-    For win32 get pdcurses at http://pdcurses.sourceforge.net
-    License: Open source
+    For win32 get pdcurses at https://pdcurses.org/
+    License: Public Domain
 
 Libpng (optional)
     Needed for the screenshots.
     For win32 get libpng from http://gnuwin32.sourceforge.net/packages.html
     See http://www.libpng.org/pub/png/ for more details.
-    License: Open Source
+    License: zlib/libpng
 
 Zlib (optional)
     Needed by libpng.
     For win32 get libz (rename to zlib) from http://gnuwin32.sourceforge.net/packages.html
-    See http://www.zlib.net for more details.
-    License: Open Source
+    See https://www.zlib.net/ for more details.
+    License: zlib
 
 SDL_Net (optional)
-    For modem/ipx support. Get it from http://www.libsdl.org/projects/SDL_net/
-    Licensed under LGPL
+    For modem/ipx support.
+    Get it from https://www.libsdl.org/projects/SDL_net/release-1.2.html
+    License: LGPLv2+
 
 alsa-lib (optional)
     For ALSA audio support under linux. Get it from https://www.alsa-project.org/
@@ -65,45 +66,50 @@ If you want compile from developer sources (SVN) under a unix system, you will n
  - pkg-config (>= 0.25)
 
 For building on unix systems.
-If you are building from developer sources run ./autogen.sh first before doing the following.
+If you are building from developer sources run ./autogen.sh first before doing
+the following:
 
-1. ./configure
-2. make
+    $ ./configure
+    $ make
 
-In step 1 you could add the following switches:
---enable-debug 
-        enables the internal debugger. --enable-debug=heavy enables even more 
-        debug options. DOSBox should then be run from a xterm and when the sdl-
-        window is active press alt-pause to enter the debugger.
+You can also run "./configure --help" for extra features to enable/disable.
+Some of them are:
 
---enable-core-inline
-        enables some memory increasing inlines. This greatly increases 
-        compiletime for maybe a increase in speed.
+--enable-debug
+        enables the internal debugger. --enable-debug=heavy enables even more
+        debug options. To use the debugger, DOSBox should be run from an xterm
+        and when the sdl-window is active press alt-pause to enter the
+        debugger.
+
+--disable-core-inline
+        disables some memory increasing inlines. This speeds up compilation,
+        but may result in a slower dosbox.
 
 --disable-fpu
-        disables the emulated fpu. Although the fpu emulation code isn't 
-        finished and isn't entirely accurate it's advised to leave it on. 
+        disables the emulated fpu. Although the fpu emulation code isn't
+        finished and isn't entirely accurate, it's advised to leave it on.
 
 --disable-fpu-x86
 --disable-fpu-x64
-        disables the assembly fpu core. Although relatively new, the x86/x64 fpu 
-        core has more accuracy then the regular fpu core. 
+        disables the assembly fpu core. Although relatively new, the x86/x64
+        fpu core has more accuracy then the regular fpu core.
 
 --disable-dynamic-x86
-        disables the dynamic x86 specific cpu core. Although it might be 
-        be a bit unstable, it can greatly improve the speed of dosbox on x86 
-        hosts.
-        Please note that this option on x86 will result in a different
+        disables the dynamic x86/x64 specific cpu core. Although it might be
+        a bit unstable, it can greatly improve the speed of dosbox on x86 and
+        x64 hosts.
+        Please note that this option on x86/x64 will result in a different
         dynamic/recompiling cpu core being compiled then the default.
         For more information see the option --disable-dynrec
 
 --disable-dynrec
-        disables the recompiling cpu core. Currently x86 and x86_64 only.
-        You can activate this core on x86 by disabling the dynamic-x86 core.
+        disables the recompiling cpu core. Currently x86/x64 and arm only.
+        You can activate this core on x86/x64 by disabling the dynamic-x86
+        core.
 
 --disable-dynamic-core
-        disables all dynamic cores. (same effect as 
-        --disable-dynamic-x86 --disable-dynrec)
+        disables all dynamic cores (same effect as --disable-dynamic-x86
+        or --disable-dynrec).
 
 --disable-opengl
         disables OpenGL-support (output mode that can be selected in the

configure.ac

@@ -364,8 +364,8 @@ esac
 
 AC_ARG_ENABLE(dynamic-core,AC_HELP_STRING([--disable-dynamic-core],[Disable all dynamic cores]),,enable_dynamic_core=yes)
 
-AH_TEMPLATE(C_DYNAMIC_X86,[Define to 1 to use x86 dynamic cpu core])
-AC_ARG_ENABLE(dynamic-x86,AC_HELP_STRING([--disable-dynamic-x86],[Disable x86 dynamic cpu core]),,enable_dynamic_x86=yes)
+AH_TEMPLATE(C_DYNAMIC_X86,[Define to 1 to use x86/x64 dynamic cpu core])
+AC_ARG_ENABLE(dynamic-x86,AC_HELP_STRING([--disable-dynamic-x86],[Disable x86/x64 dynamic cpu core]),,enable_dynamic_x86=yes)
 AC_MSG_CHECKING(whether x86 dynamic cpu core will be enabled) 
 if test x$enable_dynamic_x86 = xno -o x$enable_dynamic_core = xno; then 
    AC_MSG_RESULT(no)