--- qsampler/trunk/configure.ac 2010/03/14 16:35:48 2068 +++ qsampler/trunk/configure.ac 2010/08/23 13:08:28 2116 @@ -1,9 +1,9 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.2.2.14, rncbc@rncbc.org, qsampler) +AC_INIT(Qsampler, 0.2.2.27, rncbc@rncbc.org, qsampler) -AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui) -AC_CONFIG_HEADERS(config.h) -AC_CONFIG_FILES(Makefile qsampler.pro qsampler.spec qsampler.desktop) +AC_CONFIG_SRCDIR(src/qsampler.cpp) +AC_CONFIG_HEADERS(src/config.h) +AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri src/qsampler.desktop) # Set default installation prefix. AC_PREFIX_DEFAULT(/usr/local) @@ -111,14 +111,14 @@ done # Check for proper Qt version. -AC_CACHE_CHECK([for Qt library version >= 4.1], +AC_CACHE_CHECK([for Qt library version >= 4.2], ac_cv_qtversion, [ AC_TRY_LINK([#include "Qt/qglobal.h"], [ -#if QT_VERSION < 0x040100 -#error Qt library 4.1 or greater required. +#if QT_VERSION < 0x040200 +#error Qt library 4.2 or greater required. #endif ], ac_cv_qtversion="yes", [ - echo "no; Qt 4.1 or greater is required" + echo "no; Qt 4.2 or greater is required" exit ]) ]) @@ -334,6 +334,9 @@ AC_DEFINE(CONFIG_STACKTRACE, 1, [Define if debugger stack-trace is enabled.]) fi +# Some recent distros (eg. fedora, debian) require this. +ac_libs="$ac_libs -lX11" + AC_SUBST(ac_libs) AC_SUBST(ac_incpath)