summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure381
1 files changed, 267 insertions, 114 deletions
diff --git a/configure b/configure
index d110ebd..a0d4297 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for QjackCtl 0.4.0.
+# Generated by GNU Autoconf 2.69 for QjackCtl 0.4.1.
#
# Report bugs to <rncbc@rncbc.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='QjackCtl'
PACKAGE_TARNAME='qjackctl'
-PACKAGE_VERSION='0.4.0'
-PACKAGE_STRING='QjackCtl 0.4.0'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='QjackCtl 0.4.1'
PACKAGE_BUGREPORT='rncbc@rncbc.org'
PACKAGE_URL=''
@@ -633,6 +633,7 @@ ac_lrelease
ac_lupdate
ac_uic
ac_moc
+ac_cv_qmake
ac_qmake
EGREP
GREP
@@ -704,6 +705,7 @@ enable_jack_version
enable_alsa_seq
enable_portaudio
enable_dbus
+enable_xunique
enable_stacktrace
with_qt4
with_qt5
@@ -1264,7 +1266,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures QjackCtl 0.4.0 to adapt to many kinds of systems.
+\`configure' configures QjackCtl 0.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1325,7 +1327,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of QjackCtl 0.4.0:";;
+ short | recursive ) echo "Configuration of QjackCtl 0.4.1:";;
esac
cat <<\_ACEOF
@@ -1334,8 +1336,8 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-debug enable debugging (default=no)
- --enable-qt4 enable Qt4 build (default=yes)
- --enable-qt5 enable Qt5 build (default=no)
+ --enable-qt4 enable Qt4 build (default=no)
+ --enable-qt5 enable Qt5 build (default=yes)
--enable-system-tray enable system tray (default=yes)
--enable-jack-midi enable JACK MIDI support (default=yes)
--enable-jack-session enable JACK session support (default=yes)
@@ -1346,6 +1348,7 @@ Optional Features:
--enable-alsa-seq enable ALSA/MIDI sequencer support (default=yes)
--enable-portaudio enable PortAudio interface (default=yes)
--enable-dbus enable D-Bus interface (default=yes)
+ --enable-xunique enable X11 unique/single instance (default=yes)
--enable-stacktrace enable debugger stack-trace (default=no)
Optional Packages:
@@ -1436,7 +1439,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-QjackCtl configure 0.4.0
+QjackCtl configure 0.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1880,7 +1883,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by QjackCtl $as_me 0.4.0, which was
+It was created by QjackCtl $as_me 0.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2239,7 +2242,7 @@ ac_config_files="$ac_config_files Makefile qjackctl.spec src/src.pri src/qjackct
ac_prefix=$prefix
if test "x$ac_prefix" = "xNONE"; then
- ac_prefix=$ac_default_prefix
+ ac_prefix=$ac_default_prefix
fi
@@ -2273,7 +2276,7 @@ fi
if test "${enable_qt4+set}" = set; then :
enableval=$enable_qt4; ac_qt4="$enableval"
else
- ac_qt4="yes"
+ ac_qt4="no"
fi
@@ -2281,7 +2284,7 @@ fi
if test "${enable_qt5+set}" = set; then :
enableval=$enable_qt5; ac_qt5="$enableval"
else
- ac_qt5="no"
+ ac_qt5="yes"
fi
@@ -2375,6 +2378,15 @@ $as_echo "#define CONFIG_DBUS 1" >>confdefs.h
fi
+# Enable X11 unique/single instance.
+# Check whether --enable-xunique was given.
+if test "${enable_xunique+set}" = set; then :
+ enableval=$enable_xunique; ac_xunique="$enableval"
+else
+ ac_xunique="yes"
+fi
+
+
# Enable debugger stack-trace option (assumes --enable-debug).
# Check whether --enable-stacktrace was given.
if test "${enable_stacktrace+set}" = set; then :
@@ -2383,9 +2395,8 @@ fi
-
# Standard installation base dirs.
-ac_with_paths="/usr/local /usr"
+ac_with_paths="/usr /usr/local"
# Set for alternate Qt4/5 installation dir.
@@ -2416,11 +2427,11 @@ if test "x$ac_qt5_path" != "xno"; then
ac_qt5="yes"
fi
-if test "x$ac_qt4" = "xno"; then
- ac_qt5="yes"
+if test "x$ac_qt5" = "xno"; then
+ ac_qt4="yes"
fi
-if test "x$ac_qt5" = "xyes"; then
- ac_qt4="no"
+if test "x$ac_qt4" = "xyes"; then
+ ac_qt5="no"
fi
# Set for alternate JACK installation dir.
@@ -3963,57 +3974,29 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# Check for proper flags.
ac_arch=`uname -m`
-# Check for some a-la-debian alternatives...
-ac_qtdirs="qt"
-
-if test "x$ac_qt4" = "xyes"; then
- ac_qtdirs="qt4 $ac_qtdirs"
-fi
-if test "x$ac_qt5" = "xyes"; then
- ac_qtdirs="qt5 $ac_qtdirs"
-fi
-
-ac_topdirs="/usr/local /usr"
-ac_subdirs="lib"
+# Check for install paths and alternatives...
+ac_libdirs="lib"
if test "x$ac_arch" = "xx86_64"; then
- ac_subdirs="$ac_subdirs lib64"
-fi
-
-if test "x$ac_arch" = "xx86_64" -o "x$ac_qt5" = "xyes"; then
- CFLAGS="-fPIC $CFLAGS"
- CPPFLAGS="-fPIC $CPPFLAGS"
+ ac_libdirs="$ac_libdirs lib64"
fi
-for X in $ac_topdirs; do
- for Y in share $ac_subdirs; do
- for Z in $ac_qtdirs; do
- if test -d $X/$Y/$Z/bin; then
- ac_with_paths="$X/$Y/$Z $ac_with_paths"
- fi
- done
- done
-done
+CFLAGS="-fPIC $CFLAGS"
+CPPFLAGS="-fPIC $CPPFLAGS"
# Prepend alternate dependencies paths.
ac_path=$PATH
+
for X in $ac_with_paths; do
if test -d $X/bin; then
ac_path="$X/bin:$ac_path"
fi
if test -d $X/include; then
- for Y in $ac_qtdirs; do
- if test -d $X/include/$Y; then
- CFLAGS="-I$X/include/$Y $CFLAGS"
- CPPFLAGS="-I$X/include/$Y $CPPFLAGS"
- ac_incpath="$X/include/$Y $ac_incpath"
- fi
- done
- CFLAGS="$CFLAGS -I$X/include"
- CPPFLAGS="$CPPFLAGS -I$X/include"
- ac_incpath="$ac_incpath $X/include"
+ CFLAGS="-I$X/include $CFLAGS "
+ CPPFLAGS="-I$X/include $CPPFLAGS"
+ ac_incpath="$X/include $ac_incpath"
fi
- for Y in $ac_subdirs; do
+ for Y in $ac_libdirs; do
if test -d $X/$Y; then
LIBS="-L$X/$Y $LIBS"
ac_libs="-L$X/$Y $ac_libs"
@@ -4021,6 +4004,219 @@ for X in $ac_with_paths; do
done
done
+# A common error message:
+ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
+
+if test "x$ac_qt4" = "xyes"; then
+ # Extract the first word of "qmake-qt4", so it can be a program name with args.
+set dummy qmake-qt4; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_qmake+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_qmake in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_qmake="$ac_qmake" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ac_path
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_qmake="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_ac_qmake" && ac_cv_path_ac_qmake="no"
+ ;;
+esac
+fi
+ac_qmake=$ac_cv_path_ac_qmake
+if test -n "$ac_qmake"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_qmake" >&5
+$as_echo "$ac_qmake" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test "x$ac_qt5" = "xyes"; then
+ # Extract the first word of "qmake-qt5", so it can be a program name with args.
+set dummy qmake-qt5; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_qmake+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_qmake in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_qmake="$ac_qmake" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ac_path
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_qmake="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_ac_qmake" && ac_cv_path_ac_qmake="no"
+ ;;
+esac
+fi
+ac_qmake=$ac_cv_path_ac_qmake
+if test -n "$ac_qmake"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_qmake" >&5
+$as_echo "$ac_qmake" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test "x$ac_qmake" = "xno"; then
+ # Extract the first word of "qmake", so it can be a program name with args.
+set dummy qmake; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_cv_qmake+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_cv_qmake in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_cv_qmake="$ac_cv_qmake" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ac_path
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_cv_qmake="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_ac_cv_qmake" && ac_cv_path_ac_cv_qmake="no"
+ ;;
+esac
+fi
+ac_cv_qmake=$ac_cv_path_ac_cv_qmake
+if test -n "$ac_cv_qmake"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_qmake" >&5
+$as_echo "$ac_cv_qmake" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ ac_qmake=$ac_cv_qmake
+fi
+if test "x$ac_qmake" = "xno"; then
+ as_fn_error $? "qmake $ac_errmsg" "$LINENO" 5
+fi
+
+# Check for proper Qt4/5 major version.
+ac_qt_version_major=`$ac_qmake -query QT_VERSION | cut -d. -f1`
+if test "x$ac_qt4" = "xyes" -a "x$ac_qt_version_major" != "x4"; then
+ as_fn_error $? "qmake-qt4 $ac_errmsg (qt4-devel)" "$LINENO" 5
+fi
+if test "x$ac_qt5" = "xyes" -a "x$ac_qt_version_major" != "x5"; then
+ as_fn_error $? "qmake-qt5 $ac_errmsg (qt5-devel)" "$LINENO" 5
+fi
+
+ac_qt_install_bins=`$ac_qmake -query QT_INSTALL_BINS`
+if test -d $ac_qt_install_bins; then
+ ac_path="$ac_qt_install_bins:$ac_path"
+fi
+
+# Check it again, now with updated PATH, just in case...
+# Extract the first word of "qmake", so it can be a program name with args.
+set dummy qmake; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_cv_qmake+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_cv_qmake in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_cv_qmake="$ac_cv_qmake" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ac_path
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_cv_qmake="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_ac_cv_qmake" && ac_cv_path_ac_cv_qmake="no"
+ ;;
+esac
+fi
+ac_cv_qmake=$ac_cv_path_ac_cv_qmake
+if test -n "$ac_cv_qmake"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_qmake" >&5
+$as_echo "$ac_cv_qmake" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ac_qmake=$ac_cv_qmake
+if test "x$ac_qmake" = "xno"; then
+ as_fn_error $? "qmake $ac_errmsg" "$LINENO" 5
+fi
+
+
+
+ac_qt_install_headers=`$ac_qmake -query QT_INSTALL_HEADERS`
+if test -d $ac_qt_install_headers; then
+ CFLAGS="-I$ac_qt_install_headers $CFLAGS "
+ CPPFLAGS="-I$ac_qt_install_headers $CPPFLAGS"
+ ac_incpath="$ac_qt_install_headers $ac_incpath"
+fi
+
+ac_qt_install_libs=`$ac_qmake -query QT_INSTALL_LIBS`
+if test -d $ac_qt_install_libs; then
+ LIBS="-L$ac_qt_install_libs $LIBS"
+ ac_libs="-L$ac_qt_install_libs $ac_libs"
+fi
+
# Check for proper Qt4/5 version.
if test "x$ac_qt4" = "xyes"; then
@@ -4045,7 +4241,7 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_qtversion="yes"
else
@@ -4053,8 +4249,7 @@ else
exit 1
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_qtversion" >&5
@@ -4083,7 +4278,7 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_qtversion="yes"
else
@@ -4091,64 +4286,13 @@ else
exit 1
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_qtversion" >&5
$as_echo "$ac_cv_qtversion" >&6; }
fi
-# A common error message:
-ac_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt-devel)."
-
-# Check for Qt qmake utility.
-# Extract the first word of "qmake", so it can be a program name with args.
-set dummy qmake; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_qmake+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_qmake in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_qmake="$ac_qmake" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $ac_path
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_qmake="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_ac_qmake" && ac_cv_path_ac_qmake="no"
- ;;
-esac
-fi
-ac_qmake=$ac_cv_path_ac_qmake
-if test -n "$ac_qmake"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_qmake" >&5
-$as_echo "$ac_qmake" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "x$ac_qmake" = "xno"; then
- as_fn_error $? "qmake $ac_errmsg" "$LINENO" 5
-fi
-
-
# Check for Qt moc utility.
# Extract the first word of "moc", so it can be a program name with args.
set dummy moc; ac_word=$2
@@ -4337,6 +4481,7 @@ if test "x$ac_release" = "xno"; then
fi
+
# Checks for libraries.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
$as_echo_n "checking for main in -lm... " >&6; }
@@ -4997,6 +5142,13 @@ $as_echo "$as_me: WARNING: *** PortAudio interface support will be disabled." >&
fi
fi
+# Check for X11 unique/single instance.
+if test "x$ac_xunique" = "xyes"; then
+
+$as_echo "#define CONFIG_XUNIQUE 1" >>confdefs.h
+
+fi
+
# Check for debugging stack-trace.
if test "x$ac_stacktrace" = "xyes"; then
@@ -5893,7 +6045,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by QjackCtl $as_me 0.4.0, which was
+This file was extended by QjackCtl $as_me 0.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5955,7 +6107,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-QjackCtl config.status 0.4.0
+QjackCtl config.status 0.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -6688,6 +6840,7 @@ echo " D-Bus interface support . . . . . . . . . . . . .: $ac_dbus"
echo " PortAudio interface support . . . . . . . . . . .: $ac_portaudio"
echo " CoreAudio interface support . . . . . . . . . . .: $ac_coreaudio"
echo
+echo " X11 Unique/Single instance . . . . . . . . . . . .: $ac_xunique"
echo " Debugger stack-trace (gdb) . . . . . . . . . . . .: $ac_stacktrace"
echo
echo " Install prefix . . . . . . . . . . . . . . . . . .: $ac_prefix"