From a57a5c01229f0035b6ad1e566f9d5dde39650be7 Mon Sep 17 00:00:00 2001
From: Andreas Eversberg <jolly@eversberg.eu>
Date: Fri, 16 Feb 2018 15:53:48 +0100
Subject: Improving and cleaning configure script

---
 configure.ac | 42 +++++++-----------------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 0ae3f5f..8f729d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script
 AC_INIT([abcnetz],
 	m4_esyscmd([./git-version-gen .tarball-version]),
-	[authors@their.domains])
+	[jolly@eversberg.eu])
 
 AM_INIT_AUTOMAKE([dist-bzip2])
 
@@ -27,54 +27,26 @@ AC_CANONICAL_HOST
 AC_CHECK_LIB([m], [main])
 AC_CHECK_LIB([pthread], [main])
 
-# disabled due to problems with api compatibilty with imagemagick
-#AC_ARG_ENABLE(graphicsmagick,
-#	[AS_HELP_STRING(
-#		[--disable-graphicsmagick],
-#		[Disable building graphicsmagick]
-#	)],
-#	[enable_graphicsmagick=$enableval], [enable_graphicsmagick="yes"])
-#if test x"$enable_graphicsmagick" = x"yes"
-#then
-#	PKG_CHECK_MODULES(GRAPHICSMAGICK, GraphicsMagick >= 1.3.16, , enable_graphicsmagick=no)
-#fi
-#if test x"$enable_graphicsmagick" = x"yes"
-#then
-#	somethingmagick=yes
-#fi
-
-AC_ARG_ENABLE(imagemagick,
-	[AS_HELP_STRING(
-		[--disable-imagemagick],
-		[Disable building imagemagick]
-	)],
-	[enable_imagemagick=$enableval], [enable_imagemagick="yes"])
-if test x"$enable_imagemagick" = x"yes"
-then
-	PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick >= 6.0.0, , enable_imagemagick=no)
-fi
-if test x"$enable_imagemagick" = x"yes"
-then
-	somethingmagick=yes
-fi
-
-AM_CONDITIONAL(ENABLE_MAGICK, test x"$somethingmagick" = x"yes")
-
 with_sdr=no
 AC_ARG_WITH([alsa], [AS_HELP_STRING([--with-alsa], [compile with Alsa driver @<:@default=check@:>@]) ], [], [with_alsa="check"])
 AC_ARG_WITH([uhd], [AS_HELP_STRING([--with-uhd], [compile with UHD driver @<:@default=check@:>@]) ], [], [with_uhd="check"])
 AC_ARG_WITH([soapy], [AS_HELP_STRING([--with-soapy], [compile with SoapySDR driver @<:@default=check@:>@]) ], [], [with_soapy="check"])
+AC_ARG_WITH([imagemagick], [AS_HELP_STRING([--with-imagemagick], [compile with ImageMagick support @<:@default=check@:>@]) ], [], [with_imagemagick="check"])
 AS_IF([test "x$with_alsa" != xno], [PKG_CHECK_MODULES(ALSA, alsa >= 1.0, with_alsa=yes, with_alsa=no)])
 AS_IF([test "x$with_uhd" != xno], [PKG_CHECK_MODULES(UHD, uhd >= 3.0.0, with_sdr=yes with_uhd=yes, with_uhd=no)])
 AS_IF([test "x$with_soapy" != xno], [PKG_CHECK_MODULES(SOAPY, SoapySDR >= 0.6.0, with_sdr=yes with_soapy=yes, with_soapy=no)])
+AS_IF([test "x$with_imagemagick" != xno], [PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick >= 6.0.0, with_imagemagick=yes, with_imagemagick=no)])
 AM_CONDITIONAL(HAVE_ALSA, test "x$with_alsa" == "xyes" )
 AM_CONDITIONAL(HAVE_UHD, test "x$with_uhd" == "xyes" )
 AM_CONDITIONAL(HAVE_SOAPY, test "x$with_soapy" == "xyes" )
 AM_CONDITIONAL(HAVE_SDR, test "x$with_sdr" == "xyes" )
+AM_CONDITIONAL(HAVE_MAGICK, test "x$with_imagemagick" == "xyes" )
 AS_IF([test "x$with_alsa" == "xyes"],[AC_MSG_NOTICE( Compiling with Alsa support )], [AC_MSG_NOTICE( Alsa sound card not supported. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. )])
 AS_IF([test "x$with_uhd" == "xyes"],[AC_MSG_NOTICE( Compiling with UHD SDR support )], [AC_MSG_NOTICE( UHD SDR not supported. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. )])
 AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR support )], [AC_MSG_NOTICE( SoapySDR not supported. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. )])
-AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
+AS_IF([test "x$with_imagemagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. )])
+
+AS_IF([test "x$with_alsa" != "xyes" -a "x$with_sdr" != "xyes"],[AC_MSG_FAILURE( Without sound nor SDR support this project does not make sense. Please support sound card for analog transceivers or better SDR!" )],[])
 
 AC_OUTPUT(
     src/libdebug/Makefile
-- 
cgit v1.2.3