compile update

2025-01-01 21:29:45 +01:00
parent e0dd59f90e
commit 743bef49ee
3 changed files with 61 additions and 109 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 AC_INIT([nolambocoin], [1.0])

 AC_PREREQ([2.59c])
-AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([cpu-miner.c])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_HEADERS([cpuminer-config.h])
@@ -12,35 +11,34 @@ AM_MAINTAINER_MODE
 EXTERNAL_CFLAGS="$CFLAGS"

 dnl Checks for programs
-AC_PROG_CC_C99
+AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AM_PROG_CC_C_O
 AM_PROG_AS
 AC_PROG_RANLIB

 if test -n "$EXTERNAL_CFLAGS"; then
-	CFLAGS="$EXTERNAL_CFLAGS"
+        CFLAGS="$EXTERNAL_CFLAGS"
 else
-	CFLAGS='-Wall -O2 -fomit-frame-pointer'
+        CFLAGS='-Wall -O2 -fomit-frame-pointer'
 fi

 dnl Checks for header files
-AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/endian.h sys/param.h syslog.h])
 # sys/sysctl.h requires sys/types.h on FreeBSD
 # sys/sysctl.h requires sys/param.h on OpenBSD
-AC_CHECK_HEADERS([sys/sysctl.h], [], [],
-[#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+AC_CHECK_HEADERS([sys/sysctl.h], [], [], [
+        #include <sys/types.h>
+        #ifdef HAVE_SYS_PARAM_H
+        #include <sys/param.h>
+        #endif
 ])

-AC_CHECK_DECLS([be32dec, le32dec, be32enc, le32enc], [], [],
-[AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#endif
+AC_CHECK_DECLS([be32dec, le32dec, be32enc, le32enc], [], [], [
+        AC_INCLUDES_DEFAULT
+        #ifdef HAVE_SYS_ENDIAN_H
+        #include <sys/endian.h>
+        #endif
 ])

 AC_FUNC_ALLOCA
@@ -49,119 +47,73 @@ AC_CHECK_FUNCS([getopt_long])
 PTHREAD_FLAGS="-pthread"
 WS2_LIBS=""

-# conditional builds for all platforms
+# Conditional builds for all platforms
 case $target in
 *-*-mingw*)
-	have_win32=true
-	PTHREAD_FLAGS=""
-	WS2_LIBS="-lws2_32"
-	;;
+        have_win32=true
+        PTHREAD_FLAGS=""
+        WS2_LIBS="-lws2_32"
+        ;;

 *linux*)
-	if test -z "$LIBCURL"; then
-	LIBCURL="-lcurl"
-	fi
+        if test -z "$LIBCURL"; then
+                LIBCURL="-lcurl"
+        fi

-	# libcurl install path (for mingw : --with-curl=/usr/local)
-	AC_ARG_WITH([curl],
-		[  --with-curl=PATH         prefix where curl is installed [default=/usr]])
+        # Check for libcurl
+        PKG_CHECK_MODULES([CURL], [libcurl], [], [AC_MSG_ERROR([libcurl is required but not installed.])])

-	if test -n "$with_curl"; then
-	LIBCURL_CFLAGS="$LIBCURL_CFLAGS -I$with_curl/include"
-	LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS -I$with_curl/include"
-	LIBCURL_LDFLAGS="$LIBCURL_LDFLAGS -L$with_curl/lib"
-	fi
+        # SSL install path (optional)
+        AC_ARG_WITH([crypto],
+                [  --with-crypto=PATH       prefix where openssl crypto is installed [default=/usr]],
+                [
+                        LIBCURL_CFLAGS="$LIBCURL_CFLAGS -I$with_crypto/include"
+                        LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS -I$with_crypto/include"
+                        LIBCURL_LDFLAGS="-L$with_crypto/lib $LIBCURL_LDFLAGS"
+                        LIBCURL="$LIBCURL -lssl -lcrypto"
+                ]
+        )

-	# SSL install path (for mingw : --with-crypto=/usr/local/ssl)
-	AC_ARG_WITH([crypto],
-		[  --with-crypto=PATH       prefix where openssl crypto is installed [default=/usr]])
+        CFLAGS="$CFLAGS $LIBCURL_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+        LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"

-	if test -n "$with_crypto" ; then
-	LIBCURL_CFLAGS="$LIBCURL_CFLAGS -I$with_crypto/include"
-	LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS -I$with_crypto/include"
-	LIBCURL_LDFLAGS="-L$with_crypto/lib $LIBCURL_LDFLAGS"
-	LIBCURL="$LIBCURL -lssl -lcrypto"
-	fi
-
-	CFLAGS="$CFLAGS $LIBCURL_CFLAGS"
-	CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-	LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
-
-	AC_SUBST(LIBCURL)
-	# AC_SUBST(LIBCURL_CFLAGS)
-	# AC_SUBST(LIBCURL_CPPFLAGS)
-	# AC_SUBST(LIBCURL_LDFLAGS)
-	;;
+        AC_SUBST(LIBCURL)
+        ;;

 *-apple-*)
-	if test -z "$LIBCURL"; then
-		LIBCURL="-lcurl"
-	fi
+        if test -z "$LIBCURL"; then
+                LIBCURL="-lcurl"
+        fi

-	# libcurl install path (for mingw : --with-curl=/usr/local)
-	AC_ARG_WITH([curl],
-	  [  --with-curl=PATH         prefix where curl is installed [default=/usr]])
+        # Check for libcurl
+        PKG_CHECK_MODULES([CURL], [libcurl], [], [AC_MSG_ERROR([libcurl is required but not installed.])])
+        LIBS="$LIBS -lcurl"

-	if test -n "$with_curl"; then
-		LIBCURL_CFLAGS="$LIBCURL_CFLAGS -I$with_curl/include"
-		LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS -I$with_curl/include"
-		LIBCURL_LDFLAGS="$LIBCURL_LDFLAGS -L$with_curl/lib"
-	fi
+        CFLAGS="$CFLAGS $LIBCURL_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+        LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"

-	# SSL install path (for mingw : --with-crypto=/usr/local/ssl)
-	AC_ARG_WITH([crypto],
-	   [  --with-crypto=PATH       prefix where openssl crypto is installed [default=/usr]])
-
-	if test -n "$with_crypto" ; then
-	   LIBCURL_CFLAGS="$LIBCURL_CFLAGS -I$with_crypto/include"
-	   LIBCURL_CPPFLAGS="$LIBCURL_CPPFLAGS -I$with_crypto/include"
-	   LIBCURL_LDFLAGS="-L$with_crypto/lib $LIBCURL_LDFLAGS"
-	   LIBCURL="$LIBCURL -lssl -lcrypto"
-	fi
-
-	CFLAGS="$CFLAGS $LIBCURL_CFLAGS"
-	CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-	LDFLAGS="$LDFLAGS $LIBCURL_LDFLAGS"
-
-	AC_SUBST(LIBCURL)
-	# AC_SUBST(LIBCURL_CFLAGS)
-	# AC_SUBST(LIBCURL_CPPFLAGS)
-	# AC_SUBST(LIBCURL_LDFLAGS)
-	;;
+        AC_SUBST(LIBCURL)
+        ;;
 esac

-case $target in
-  *-*-mingw*)
-#		LIBCURL_CHECK_CONFIG(, 7.15.2, ,
-#		  [AC_MSG_ERROR([Missing required libcurl >= 7.15.2])])
-		;;
-esac
-
-AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
-AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS="-lpthread",
-  AC_CHECK_LIB([pthreadGC2], [pthread_create], PTHREAD_LIBS="-lpthreadGC2",
-    AC_CHECK_LIB([pthreadGC1], [pthread_create], PTHREAD_LIBS="-lpthreadGC1",
-      AC_CHECK_LIB([pthreadGC], [pthread_create], PTHREAD_LIBS="-lpthreadGC"
-))))
+AC_CHECK_LIB([jansson], [json_loads], [], [AC_MSG_ERROR([jansson is required but not installed.])])
+AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS="-lpthread")
+AC_CHECK_LIB([curl], [curl_easy_init], [LIBS="$LIBS -lcurl"],
+    [AC_MSG_ERROR([libcurl is required but not found.])])

 AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
 AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])

-if test x$request_jansson = xtrue
-then
-	JANSSON_LIBS="compat/jansson/libjansson.a"
-else
-	JANSSON_LIBS=-ljansson
-fi
-
 AC_SUBST(JANSSON_LIBS)
 AC_SUBST(PTHREAD_FLAGS)
 AC_SUBST(PTHREAD_LIBS)
 AC_SUBST(WS2_LIBS)

 AC_CONFIG_FILES([
-	Makefile
-	compat/Makefile
-	compat/jansson/Makefile
-	])
+        Makefile
+        compat/Makefile
+        compat/jansson/Makefile
+])
 AC_OUTPUT