From f9ea0f6c43e5f4131bdd669e0ed17fb86872313c Mon Sep 17 00:00:00 2001
From: Diane Bruce <db@db.net>
Date: Thu, 13 Apr 2006 15:13:25 +0000
Subject: [PATCH] - Add more support in configure for jack

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@162 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 configure    | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |  16 +++++++
 2 files changed, 141 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 7d8a64e85..ad579685c 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for wsjt 5.9.2.
 #
-# $Id: configure.ac 155 2006-04-05 20:07:32Z jcdutton $
+# $Id: configure.ac 161 2006-04-13 04:50:00Z va3db $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -929,7 +929,7 @@ Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-$Id: configure.ac 155 2006-04-05 20:07:32Z jcdutton $
+$Id: configure.ac 161 2006-04-13 04:50:00Z va3db $
 _ACEOF
   exit 0
 fi
@@ -4015,6 +4015,114 @@ else
 fi
 
 
+if test "${ac_cv_header_jack_jack_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for jack/jack.h" >&5
+echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6
+if test "${ac_cv_header_jack_jack_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_jack_jack_h" >&5
+echo "${ECHO_T}$ac_cv_header_jack_jack_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking jack/jack.h usability" >&5
+echo $ECHO_N "checking jack/jack.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+$ac_includes_default
+#include <jack/jack.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking jack/jack.h presence" >&5
+echo $ECHO_N "checking jack/jack.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <jack/jack.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: jack/jack.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jack/jack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&2;};;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: jack/jack.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jack/jack.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jack/jack.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jack/jack.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&2;};;
+esac
+echo "$as_me:$LINENO: checking for jack/jack.h" >&5
+echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6
+if test "${ac_cv_header_jack_jack_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_jack_jack_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_jack_jack_h" >&5
+echo "${ECHO_T}$ac_cv_header_jack_jack_h" >&6
+
+fi
+if test $ac_cv_header_jack_jack_h = yes; then
+  HAS_JACK_H=1
+else
+  HAS_JACK_H=0
+fi
+
+
 if test "${ac_cv_header_portaudio_h+set}" = set; then
   echo "$as_me:$LINENO: checking for portaudio.h" >&5
 echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6
@@ -6034,6 +6142,13 @@ _ACEOF
 
 fi
 
+if test $HAS_JACK_H -eq 1; then
+	cat >>confdefs.h <<\_ACEOF
+#define HAS_JACK_H 1
+_ACEOF
+
+fi
+
 if test $HAS_PORTAUDIO_H -eq 1; then
 	cat >>confdefs.h <<\_ACEOF
 #define HAS_PORTAUDIO_H 1
@@ -6065,6 +6180,14 @@ echo "$as_me: error: You need soundcard.h to use --enable-oss" >&2;}
 	fi
 fi
 
+if test "$jack" = yes; then
+	if test $HAS_JACK_H -eq 0; then
+		{ { echo "$as_me:$LINENO: error: You need jack.h to use --enable-jack" >&5
+echo "$as_me: error: You need jack.h to use --enable-jack" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+fi
+
 if test "$portaudio" = yes; then
 	if test $HAS_PORTAUDIO_H -eq 0; then
 		{ { echo "$as_me:$LINENO: error: You need portaudio.h to use --enable-portaudio" >&5
diff --git a/configure.ac b/configure.ac
index 1444afce5..b024d1822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,10 @@ AC_MSG_CHECKING([g95 lib path])
 G95_LIB_PATH=`${G95} -print-file-name=`
 AC_MSG_RESULT(${G95_LIB_PATH})
 AC_PATH_PROG(GFORTRAN, gfortran)
+dnl
+dnl FreeBSD currently installs gfortran as gfortran41, considered experimental
+dnl See http://gcc.gnu.org/fortran/
+dnl
 AC_PATH_PROG(GFORTRAN, gfortran41)
 AC_MSG_CHECKING([gfortran lib path])
 GFORTRAN_LIB_PATH=`${GFORTRAN} -print-file-name=`
@@ -106,6 +110,7 @@ AC_HEADER_TIME
 
 AC_CHECK_HEADER([sys/soundcard.h], [HAS_SOUNDCARD_H=1], [HAS_SOUNDCARD_H=0])
 AC_CHECK_HEADER([alsa/asoundlib.h], [HAS_ASOUNDLIB_H=1], [HAS_ASOUNDLIB_H=0])
+AC_CHECK_HEADER([jack/jack.h], [HAS_JACK_H=1], [HAS_JACK_H=0])
 AC_CHECK_HEADER([portaudio.h], [HAS_PORTAUDIO_H=1], [HAS_PORTAUDIO_H=0])
 AC_CHECK_HEADER([samplerate.h], [HAS_SAMPLERATE_H=1], [HAS_SAMPLERATE_H=0])
 
@@ -333,6 +338,7 @@ if test "$jack" = yes; then
 fi
 
 dnl set conf flags
+dnl ==============
 
 if test $HAS_ASOUNDLIB_H -eq 1; then
 	AC_DEFINE(HAS_ASOUNDLIB_H, 1, )
@@ -342,6 +348,10 @@ if test $HAS_SOUNDCARD_H -eq 1; then
 	AC_DEFINE(HAS_SOUNDCARD_H, 1, )
 fi
 
+if test $HAS_JACK_H -eq 1; then
+	AC_DEFINE(HAS_JACK_H, 1, )
+fi
+
 if test $HAS_PORTAUDIO_H -eq 1; then
 	AC_DEFINE(HAS_PORTAUDIO_H, 1, )
 fi
@@ -365,6 +375,12 @@ if test "$oss" = yes; then
 	fi
 fi
 
+if test "$jack" = yes; then
+	if test $HAS_JACK_H -eq 0; then
+		AC_MSG_ERROR([You need jack.h to use --enable-jack])
+	fi
+fi
+
 if test "$portaudio" = yes; then
 	if test $HAS_PORTAUDIO_H -eq 0; then
 		AC_MSG_ERROR([You need portaudio.h to use --enable-portaudio])