/[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 2718 by capela, Thu Jan 22 19:01:32 2015 UTC revision 2779 by capela, Mon Jun 15 14:11:33 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.18, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.3.0.4, 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 59  AC_ARG_ENABLE(stacktrace, Line 59  AC_ARG_ENABLE(stacktrace,
59  if test "$cross_compiling" = yes; then  if test "$cross_compiling" = yes; then
60    ac_with_paths=""    ac_with_paths=""
61  else  else
62    ac_with_paths="/usr /usr/local"    ac_with_paths="/usr/local /usr"
63  fi  fi
64    
65  # Set for alternate Qt4/5 installation dir.  # Set for alternate Qt4/5 installation dir.
# Line 130  if test "x$ac_qt5" = "xyes"; then Line 130  if test "x$ac_qt5" = "xyes"; then
130     ac_qtdirs="qt5 $ac_qtdirs"     ac_qtdirs="qt5 $ac_qtdirs"
131  fi  fi
132    
133  ac_topdirs="/usr/share /usr/lib"  ac_topdirs="/usr/local /usr"
134    ac_subdirs="lib"
135    
136  if test "x$ac_arch" = "xx86_64"; then  if test "x$ac_arch" = "xx86_64"; then
137       ac_subdirs="$ac_subdirs lib64"
138    fi
139    
140    if test "x$ac_arch" = "xx86_64" -o "x$ac_qt5" = "xyes"; then
141     CFLAGS="-fPIC $CFLAGS"     CFLAGS="-fPIC $CFLAGS"
142     CPPFLAGS="-fPIC $CPPFLAGS"     CPPFLAGS="-fPIC $CPPFLAGS"
    ac_topdirs="$ac_topdirs /usr/lib64"  
143  fi  fi
144    
145  for X in $ac_topdirs; do  for X in $ac_topdirs; do
146    for Y in $ac_qtdirs; do    for Y in share $ac_subdirs; do
147      if test -d $X/$Y/bin; then      for Z in $ac_qtdirs; do
148        ac_with_paths="$X/$Y $ac_with_paths"        if test -d $X/$Y/$Z/bin; then
149      fi           ac_with_paths="$X/$Y/$Z $ac_with_paths"
150          fi
151        done
152    done    done
153  done  done
154    
# Line 152  for X in $ac_with_paths; do Line 158  for X in $ac_with_paths; do
158    if test -d $X/bin; then    if test -d $X/bin; then
159      ac_path="$X/bin:$ac_path"      ac_path="$X/bin:$ac_path"
160    fi    fi
 # if test -x $X/qmake; then  
 #   ac_path="$X:$ac_path"  
 # fi  
161    if test -d $X/include; then    if test -d $X/include; then
162      for Y in $ac_qtdirs; do      for Y in $ac_qtdirs; do
163        if test -d $X/include/$Y; then        if test -d $X/include/$Y; then
# 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"
   fi  
   if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then  
     LIBS="-L$X/lib64 $LIBS"  
     ac_libs="-L$X/lib64 $ac_libs"  
   fi  
   if test -d $X/lib; then  
     LIBS="-L$X/lib $LIBS"  
     ac_libs="-L$X/lib $ac_libs"  
172    fi    fi
173      for Y in $ac_subdirs; do
174        if test -d $X/$Y; then
175           LIBS="-L$X/$Y $LIBS"
176           ac_libs="-L$X/$Y $ac_libs"
177        fi
178      done
179  done  done
180    
181  # Check for proper Qt4/5 version.  # Check for proper Qt4/5 version.
# Line 182  if test "x$ac_qt4" = "xyes"; then Line 183  if test "x$ac_qt4" = "xyes"; then
183     AC_CACHE_CHECK([for Qt library version >= 4.4],     AC_CACHE_CHECK([for Qt library version >= 4.4],
184        ac_cv_qtversion, [        ac_cv_qtversion, [
185        AC_TRY_LINK([#include "QtCore/qglobal.h"], [        AC_TRY_LINK([#include "QtCore/qglobal.h"], [
186           #if QT_VERSION < 0x040400           #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
187           #error Qt library 4.4 or greater required.           #error Qt library 4.4 or greater required.
188           #endif           #endif
189        ], ac_cv_qtversion="yes", [        ], ac_cv_qtversion="yes", [
# Line 196  if test "x$ac_qt5" = "xyes"; then Line 197  if test "x$ac_qt5" = "xyes"; then
197     AC_CACHE_CHECK([for Qt library version >= 5.1],     AC_CACHE_CHECK([for Qt library version >= 5.1],
198        ac_cv_qtversion, [        ac_cv_qtversion, [
199        AC_TRY_LINK([#include "QtCore/qglobal.h"], [        AC_TRY_LINK([#include "QtCore/qglobal.h"], [
200           #if QT_VERSION < 0x050100           #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
201           #error Qt library 5.1 or greater required.           #error Qt library 5.1 or greater required.
202           #endif           #endif
203        ], ac_cv_qtversion="yes", [        ], ac_cv_qtversion="yes", [
Legend:
Removed from v.2718  
changed lines
  Added in v.2779
  ViewVC Help
Powered by ViewVC