angepasst

configure.ac

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-AC_INIT([nolambocoin], [1.0])
-=======
->>>>>>> b12eeead377cb6dddc74a57b520c4f3334d3e21f
 
 AC_PREREQ([2.59c])
 AC_INIT([nolambocoin-miner], [1.0])
@@ -10,8 +6,13 @@ AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([cpu-miner.c])
 AC_CONFIG_HEADERS([cpuminer-config.h])
 
-<<<<<<< HEAD
-=======
+AM_CONDITIONAL([TARGET_RASPBERRY], [false])
+AM_CONDITIONAL([TARGET_NOARM], [false])
+AM_CONDITIONAL([TARGET_X86_64], [false])
+AM_CONDITIONAL([TARGET_MACOS], [false])
+AM_CONDITIONAL([TARGET_WINDOWS], [false])
+AM_CONDITIONAL([TARGET_DEFAULT], [false])
+
 # Füge die Makefile-Konfiguration hinzu
 AC_CONFIG_FILES([Makefile
                  compat/Makefile
@@ -21,26 +22,10 @@ AC_CONFIG_FILES([Makefile
 # Lade pkg-config Makros
 PKG_PROG_PKG_CONFIG
 
->>>>>>> b12eeead377cb6dddc74a57b520c4f3334d3e21f
 AM_MAINTAINER_MODE
 
 EXTERNAL_CFLAGS="$CFLAGS"
 
-<<<<<<< HEAD
-# Check for jansson
-PKG_CHECK_MODULES([JANSSON], [jansson], [], [AC_MSG_ERROR([jansson is required but not installed.])])
-
-AM_CONDITIONAL([WANT_JANSSON], [true])
-AC_SUBST([JANSSON_CFLAGS])
-AC_SUBST([JANSSON_LIBS])
-
-# Check for libcurl
-PKG_CHECK_MODULES([CURL], [libcurl], [], [AC_MSG_ERROR([libcurl is required but not installed.])])
-AC_SUBST([CURL_CFLAGS])
-AC_SUBST([CURL_LIBS])
-
-=======
->>>>>>> b12eeead377cb6dddc74a57b520c4f3334d3e21f
 # Checks for programs
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
@@ -69,18 +54,6 @@ AC_CHECK_DECLS([be32dec, le32dec, be32enc, le32enc], [],
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS([getopt_long])
 
-<<<<<<< HEAD
-# Define WS2_LIBS for Windows (set to empty for non-Windows platforms)
-WS2_LIBS=""
-case "$target_os" in
-    mingw*|cygwin*)
-        WS2_LIBS="-lws2_32"
-        ;;
-esac
-AC_SUBST([WS2_LIBS])
-
-# Platform detection
-=======
 # Pthread Flags
 AC_CHECK_LIB([pthread], [pthread_create],
     [PTHREAD_LIBS="-lpthread"],
@@ -100,7 +73,6 @@ WS2_LIBS=""
 have_win32=false
 
 # Plattform-Erkennung
->>>>>>> b12eeead377cb6dddc74a57b520c4f3334d3e21f
 UNAME_S=`uname -s`
 UNAME_M=`uname -m`
 
@@ -112,17 +84,17 @@ case "$UNAME_S" in
         case "$UNAME_M" in
             armv7l*|armv8*|aarch64*)
                 if grep -q "Raspberry Pi" /proc/device-tree/model 2>/dev/null; then
-                    AC_DEFINE([TARGET_RASPBERRY_PI], [1], [Define to 1 if compiling for Raspberry Pi])
-                    AM_CONDITIONAL([TARGET_RASPBERRY_PI], [true])
-                    AM_CONDITIONAL([TARGET_ARM_SERVER], [false])
+                    AC_DEFINE([TARGET_RASPBERRY], [1], [Define to 1 if compiling for Raspberry])
+                    AM_CONDITIONAL([TARGET_RASPBERRY], [true])
+                    AM_CONDITIONAL([TARGET_NOARM], [false])
                     AM_CONDITIONAL([TARGET_X86_64], [false])
                     AM_CONDITIONAL([TARGET_MACOS], [false])
                     AM_CONDITIONAL([TARGET_WINDOWS], [false])
                     AC_MSG_NOTICE([Target platform: Raspberry Pi])
                 else
-                    AC_DEFINE([TARGET_ARM_SERVER], [1], [Define to 1 if compiling for ARM Server])
-                    AM_CONDITIONAL([TARGET_ARM_SERVER], [true])
-                    AM_CONDITIONAL([TARGET_RASPBERRY_PI], [false])
+                    AC_DEFINE([TARGET_NOARM], [1], [Define to 1 if compiling for ARM Server])
+                    AM_CONDITIONAL([TARGET_NOARM], [true])
+                    AM_CONDITIONAL([TARGET_RASPBERRY], [false])
                     AM_CONDITIONAL([TARGET_X86_64], [false])
                     AM_CONDITIONAL([TARGET_MACOS], [false])
                     AM_CONDITIONAL([TARGET_WINDOWS], [false])
@@ -132,8 +104,8 @@ case "$UNAME_S" in
             x86_64*)
                 AC_DEFINE([TARGET_X86_64], [1], [Define to 1 if compiling for x86_64])
                 AM_CONDITIONAL([TARGET_X86_64], [true])
-                AM_CONDITIONAL([TARGET_RASPBERRY_PI], [false])
-                AM_CONDITIONAL([TARGET_ARM_SERVER], [false])
+                AM_CONDITIONAL([TARGET_RASPBERRY], [false])
+                AM_CONDITIONAL([TARGET_NOARM], [false])
                 AM_CONDITIONAL([TARGET_MACOS], [false])
                 AM_CONDITIONAL([TARGET_WINDOWS], [false])
                 AC_MSG_NOTICE([Target platform: x86_64])
@@ -146,8 +118,8 @@ case "$UNAME_S" in
     Darwin*)
         AC_DEFINE([TARGET_MACOS], [1], [Define to 1 if compiling for macOS])
         AM_CONDITIONAL([TARGET_MACOS], [true])
-        AM_CONDITIONAL([TARGET_RASPBERRY_PI], [false])
-        AM_CONDITIONAL([TARGET_ARM_SERVER], [false])
+        AM_CONDITIONAL([TARGET_RASPBERRY], [false])
+        AM_CONDITIONAL([TARGET_NOARM], [false])
         AM_CONDITIONAL([TARGET_X86_64], [false])
         AM_CONDITIONAL([TARGET_WINDOWS], [false])
         AC_MSG_NOTICE([Target platform: macOS])
@@ -155,8 +127,8 @@ case "$UNAME_S" in
     CYGWIN*|MINGW32*|MSYS*|MINGW*)
         AC_DEFINE([TARGET_WINDOWS], [1], [Define to 1 if compiling for Windows])
         AM_CONDITIONAL([TARGET_WINDOWS], [true])
-        AM_CONDITIONAL([TARGET_RASPBERRY_PI], [false])
-        AM_CONDITIONAL([TARGET_ARM_SERVER], [false])
+        AM_CONDITIONAL([TARGET_RASPBERRY], [false])
+        AM_CONDITIONAL([TARGET_NOARM], [false])
         AM_CONDITIONAL([TARGET_X86_64], [false])
         AM_CONDITIONAL([TARGET_MACOS], [false])
         AC_MSG_NOTICE([Target platform: Windows])
@@ -166,13 +138,6 @@ case "$UNAME_S" in
         ;;
 esac
 
-<<<<<<< HEAD
-AC_CONFIG_FILES([
-    Makefile
-    compat/Makefile
-    compat/jansson/Makefile
-])
-=======
 AM_CONDITIONAL([WANT_JANSSON], [true])
 
 # Checks für libcurl
@@ -191,5 +156,4 @@ AC_SUBST([PTHREAD_CFLAGS])
 AC_SUBST([PTHREAD_LIBS])
 AC_SUBST([WS2_LIBS])
 
->>>>>>> b12eeead377cb6dddc74a57b520c4f3334d3e21f
 AC_OUTPUT