/[svn]/qsampler/trunk/configure.ac
ViewVC logotype

Diff of /qsampler/trunk/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2724 by capela, Mon Mar 9 09:13:24 2015 UTC revision 2765 by capela, Sat May 23 12:37:34 2015 UTC
# Line 1  Line 1 
1  # Process this file with autoconf to produce a configure script.  # Process this file with autoconf to produce a configure script.
2  AC_INIT(Qsampler, 0.2.3.21, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.3.0.2, rncbc@rncbc.org, qsampler)
3    
4  AC_CONFIG_SRCDIR(src/qsampler.cpp)  AC_CONFIG_SRCDIR(src/qsampler.cpp)
5  AC_CONFIG_HEADERS(src/config.h)  AC_CONFIG_HEADERS(src/config.h)
# Line 133  fi Line 133  fi
133  ac_topdirs="/usr/share /usr/lib"  ac_topdirs="/usr/share /usr/lib"
134    
135  if test "x$ac_arch" = "xx86_64"; then  if test "x$ac_arch" = "xx86_64"; then
136       ac_topdirs="$ac_topdirs /usr/lib64"
137    fi
138    
139    if test "x$ac_arch" = "xx86_64" -o "x$ac_qt5" = "xyes"; then
140     CFLAGS="-fPIC $CFLAGS"     CFLAGS="-fPIC $CFLAGS"
141     CPPFLAGS="-fPIC $CPPFLAGS"     CPPFLAGS="-fPIC $CPPFLAGS"
    ac_topdirs="$ac_topdirs /usr/lib64"  
142  fi  fi
143    
144  for X in $ac_topdirs; do  for X in $ac_topdirs; do
# Line 163  for X in $ac_with_paths; do Line 166  for X in $ac_with_paths; do
166          ac_incpath="$X/include/$Y $ac_incpath"          ac_incpath="$X/include/$Y $ac_incpath"
167        fi        fi
168      done      done
169      CFLAGS="-I$X/include $CFLAGS"      CFLAGS="$CFLAGS -I$X/include"
170      CPPFLAGS="-I$X/include $CPPFLAGS"      CPPFLAGS="$CPPFLAGS -I$X/include"
171      ac_incpath="$X/include $ac_incpath"      ac_incpath="$ac_incpath $X/include"
172    fi    fi
173    if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then    if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then
174      LIBS="-L$X/lib64 $LIBS"      LIBS="-L$X/lib64 $LIBS"
# Line 182  if test "x$ac_qt4" = "xyes"; then Line 185  if test "x$ac_qt4" = "xyes"; then
185     AC_CACHE_CHECK([for Qt library version >= 4.4],     AC_CACHE_CHECK([for Qt library version >= 4.4],
186        ac_cv_qtversion, [        ac_cv_qtversion, [
187        AC_TRY_LINK([#include "QtCore/qglobal.h"], [        AC_TRY_LINK([#include "QtCore/qglobal.h"], [
188           #if QT_VERSION < 0x040400           #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
189           #error Qt library 4.4 or greater required.           #error Qt library 4.4 or greater required.
190           #endif           #endif
191        ], ac_cv_qtversion="yes", [        ], ac_cv_qtversion="yes", [
# Line 196  if test "x$ac_qt5" = "xyes"; then Line 199  if test "x$ac_qt5" = "xyes"; then
199     AC_CACHE_CHECK([for Qt library version >= 5.1],     AC_CACHE_CHECK([for Qt library version >= 5.1],
200        ac_cv_qtversion, [        ac_cv_qtversion, [
201        AC_TRY_LINK([#include "QtCore/qglobal.h"], [        AC_TRY_LINK([#include "QtCore/qglobal.h"], [
202           #if QT_VERSION < 0x050100           #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
203           #error Qt library 5.1 or greater required.           #error Qt library 5.1 or greater required.
204           #endif           #endif
205        ], ac_cv_qtversion="yes", [        ], ac_cv_qtversion="yes", [
Legend:
Removed from v.2724  
changed lines
  Added in v.2765
  ViewVC Help
Powered by ViewVC