From 0c0e10537b7a8d7849d9d0cc2ce8e8e4d64830cc Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Sat, 10 May 2014 23:00:28 +0200
Subject: [PATCH] FS-UAE 2.5.4dev

---
 ChangeLog                   |  4 ++
 Makefile.py                 | 17 ++++-----
 VERSION                     |  2 +-
 configure.ac                | 76 +++++++++++++++++++++++++++++++++++--
 out/.dummy                  |  0
 po/update.py                | 64 -------------------------------
 po/update.sh                |  6 ---
 src/include/uae/jitconfig.h |  3 --
 src/od-fs/defines.h         |  1 -
 9 files changed, 85 insertions(+), 88 deletions(-)
 delete mode 100644 out/.dummy
 delete mode 100644 po/update.py
 delete mode 100755 po/update.sh

diff --git a/ChangeLog b/ChangeLog
index 45bd1964b..32bca70fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 2.5.4dev:
+
+* Some more autoconf / build updates.
+
 Version 2.5.3dev:
 
 * Merged code from WinUAE 2800.
diff --git a/Makefile.py b/Makefile.py
index 600207074..d65573b10 100755
--- a/Makefile.py
+++ b/Makefile.py
@@ -575,23 +575,18 @@ def main():
 mo: $(catalogs)
 
 distdir-base:
-    rm -Rf $(dist_dir)/*
+    rm -Rf $(dist_dir)
     mkdir -p $(dist_dir)
-    # cp -a $(dist_dir_launcher) $(dist_dir)/launcher
 
-    mkdir -p $(dist_dir)/obj
-    touch $(dist_dir)/obj/.dummy
-    mkdir -p $(dist_dir)/out
-    touch $(dist_dir)/out/.dummy
     cp -a INSTALL README COPYING NEWS AUTHORS $(dist_dir)
     cp -a VERSION SERIES ChangeLog $(dist_dir)
-    # windows.mk macosx.mk debian.mk
     cp -a fs-uae.spec $(dist_dir)
     cp -a example.conf $(dist_dir)
     cp -a configure.ac $(dist_dir)
     cp -a bootstrap.sh $(dist_dir)
     cp -a Makefile.py $(dist_dir)
     cp -a src contrib share licenses $(dist_dir)
+
     rm -Rf $(dist_dir)/src/od-win32
     rm -Rf $(dist_dir)/src/prowizard
     rm -Rf $(dist_dir)/src/archivers/lha
@@ -604,8 +599,6 @@ def main():
     rm -f $(dist_dir)/src/catweasel.cpp
 
     find $(dist_dir)/share -name "*.mo" -delete
-    # mkdir -p $(dist_dir)/gensrc
-    # cp -a gensrc/*.cpp gensrc/*.h $(dist_dir)/gensrc
 
     mkdir -p $(dist_dir)/libfsemu
     cp -a $(libfsemu_dir)/COPYING $(dist_dir)/libfsemu
@@ -750,6 +743,12 @@ def main():
     rm -f fs-uae-device-helper fs-uae-device-helper.exe
 
 distclean: clean clean-dist
+    rm -f config.h
+    rm -f config.log
+    rm -f config.status
+    rm -f Makefile
+    rm -Rf share/locale/
+    rm -f stamp-h1
 """
 
 if __name__ == "__main__":
diff --git a/VERSION b/VERSION
index 8c06cbd99..8e2416bf6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.3dev
+2.5.4dev
diff --git a/configure.ac b/configure.ac
index 67a9147a9..c1168179c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,11 +356,79 @@ AS_CASE([$target_os],
 #])
 
 
-# Features
+# JIT support
 
-AC_DEFINE([WITH_NETPLAY], [1], [Define to 1 to enable net play])
-# AC_DEFINE([WITH_LUA], [1], [Define to 1 to enable LUA scripting])
-AC_DEFINE([WITH_XML_SHADER], [1], [Define to 1 to enable XML shaders])
+AC_ARG_ENABLE([jit], [
+    AS_HELP_STRING([--enable-jit],
+        [enable support for JIT compilation @<:@default=check@:>@])
+    ], [], [enable_jit=check])
+
+AS_IF([test "x$enable_jit" != xno], [
+    AC_TRY_COMPILE([
+    ], [
+        #ifndef __i386__
+        #error JIT is only supported on x86
+        #endif
+        #if defined(__OpenBSD__) || defined(__FreeBSD__)
+        #error no JIT on OpenBSD/FreeBSD right now
+        #endif
+    ], [
+        AC_DEFINE([JIT], [1], [Define to 1 to enable JIT compilation])
+    ], [
+        if test "x$enable_jit" != xcheck; then
+            AC_MSG_FAILURE(
+                [--enable-jit was given, but arch is not supported])
+        fi
+    ]) 
+], [])
+
+
+# Netplay feature.
+
+AC_ARG_ENABLE([netplay], [
+    AS_HELP_STRING([--disable-netplay],
+        [disable netplay support])
+    ], [], [enable_netplay=yes])
+
+AS_IF([test "x$enable_netplay" != xno], [
+    AC_DEFINE([WITH_NETPLAY], [1], [Define to 1 to enable net play])
+], [])
+
+
+# LUA scripting feature.
+
+AC_ARG_ENABLE([lua], [
+    AS_HELP_STRING([--enable-lua],
+        [enable Lua scripting support]
+    )], [], [enable_lua=no])
+
+AS_IF([test "x$enable_lua" != xno], [
+    AC_DEFINE([WITH_LUA], [1], [Define to 1 to enable LUA scripting])
+], [])
+
+
+# Optional uaenative.library support.
+
+AC_ARG_ENABLE([uaenative], [
+    AS_HELP_STRING([--disable-uaenative],
+        [disable UAE native library interface]
+    )], [], [enable_uaenative=yes])
+
+AS_IF([test "x$enable_uaenative" != xno], [
+    AC_DEFINE([WITH_UAENATIVE], [1], [Define to 1 to enable uaenative.library])
+], [])
+
+
+# XML shader feature.
+
+AC_ARG_ENABLE([xml-shader], [
+    AS_HELP_STRING([--disable-xml-shader],
+        [disable XML shader support]
+    )], [], [enable_xml_shader=yes])
+
+AS_IF([test "x$enable_xml_shader" != xno], [
+    AC_DEFINE([WITH_XML_SHADER], [1], [Define to 1 to enable XML shaders])
+], [])
 
 
 # Byte swapping
diff --git a/out/.dummy b/out/.dummy
deleted file mode 100644
index e69de29bb..000000000
diff --git a/po/update.py b/po/update.py
deleted file mode 100644
index 5e048f3fc..000000000
--- a/po/update.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-from __future__ import print_function
-
-import os
-import shutil
-import tempfile
-import subprocess
-
-dirs = ["src"]
-files = []
-extensions = [".c", ".cpp", ".h"]
-
-temp = tempfile.NamedTemporaryFile(delete=False)
-for dir in dirs:
-    for dir_path, dir_names, file_names in os.walk(dir):
-        for file in file_names:
-            name, ext = os.path.splitext(file)
-            if ext not in extensions:
-                continue
-            path = os.path.join(dir_path, file)
-            files.append(path)
-            
-with temp:
-    for path in sorted(files):
-        temp.write(path)
-        temp.write("\n")
-
-args = ["xgettext",
-        "--output-dir=po",
-        "--files-from=" + temp.name,
-        "--keyword=_",
-        "--keyword=N_",
-        "--package-name=fs-uae",
-        "--msgid-bugs-address=frode@fs-uae.net",
-        "--copyright-holder=Frode Solheim",
-        "--add-comments=/",
-        "--no-location",
-        "--sort-output",
-        ]
-
-p = subprocess.Popen(args)
-p.wait()
-shutil.move("po/messages.po", "po/messages.pot")
-
-#for file in os.listdir("po"):
-#    if file.endswith(".po"):
-#        path = os.path.join("po", file)
-#        print(path)
-#        p = subprocess.Popen(["msgmerge",
-#                              "--no-fuzzy-matching",
-#                              "--sort-output",
-#                              "--update",
-#                              path,
-#                              "po/messages.pot"])
-#        p.wait()
-
-os.system("find share -name fs-uae.mo -delete")
-
-#print("\n\nlauncher:")
-#os.system("cd launcher && python po/update.py")
-#os.chdir("launcher")
-#os.system("python po/update.py")
-
-os.system("make po-dist mo")
diff --git a/po/update.sh b/po/update.sh
deleted file mode 100755
index 0adedc33d..000000000
--- a/po/update.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-SERIES=`cat SERIES`
-mkdir -p dist/$SERIES/po/fs-uae
-find . -name *.mo -delete
-python po/update.py &> dist/$SERIES/po/status.txt
diff --git a/src/include/uae/jitconfig.h b/src/include/uae/jitconfig.h
index 95374782b..e8409a716 100644
--- a/src/include/uae/jitconfig.h
+++ b/src/include/uae/jitconfig.h
@@ -1,10 +1,7 @@
 #ifndef _UAE_JITCONFIG_H_
 #define _UAE_JITCONFIG_H_
 
-#if defined(__i386__) && !defined(OPENBSD) && !defined(FREEBSD)
-#define JIT
 // #define JIT_DEBUG
-#endif
 
 #if defined(__i386__)
 // set up correct REGPARAMS for JIT
diff --git a/src/od-fs/defines.h b/src/od-fs/defines.h
index aedcbe9e4..9eb747ea2 100644
--- a/src/od-fs/defines.h
+++ b/src/od-fs/defines.h
@@ -122,7 +122,6 @@ extern FILE *g_fs_uae_sync_debug_file;
 #ifdef LINUX
 #define WITH_SCSI_IOCTL
 #endif
-#define WITH_UAENATIVE
 
 #define XARCADE
 #define GNU_SOURCE 1