/[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 2797 by schoenebeck, Fri Jul 17 16:50:22 2015 UTC revision 2823 by capela, Sun Jul 19 16:35:24 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.3.0.4, rncbc@rncbc.org, qsampler)  AC_INIT(Qsampler, 0.3.1, 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 81  if test "x$ac_qt5_path" != "xno"; then Line 81  if test "x$ac_qt5_path" != "xno"; then
81     ac_qt5="yes"     ac_qt5="yes"
82  fi  fi
83    
84  if test "x$ac_qt4" != "xyes"; then  if test "x$ac_qt5" = "xno"; then
    ac_qt5="yes"  
    ac_qt4="no"  
 else  
    ac_qt5="no"  
85     ac_qt4="yes"     ac_qt4="yes"
86  fi  fi
87    if test "x$ac_qt4" = "xyes"; then
88       ac_qt5="no"
89    fi
90    
91  # Set for alternate liblscp installation dir.  # Set for alternate liblscp installation dir.
92  AC_ARG_WITH(liblscp,  AC_ARG_WITH(liblscp,
# Line 147  for X in $ac_topdirs; do Line 146  for X in $ac_topdirs; do
146    for Y in share $ac_subdirs; do    for Y in share $ac_subdirs; do
147      for Z in $ac_qtdirs; do      for Z in $ac_qtdirs; do
148        if test -d $X/$Y/$Z/bin; then        if test -d $X/$Y/$Z/bin; then
149           ac_with_paths="$X/$Y/$Z $ac_with_paths"           ac_with_paths="$ac_with_paths $X/$Y/$Z"
150        fi        fi
151      done      done
152    done    done
# Line 155  done Line 154  done
154    
155  # Prepend alternate dependencies paths.  # Prepend alternate dependencies paths.
156  ac_path=$PATH  ac_path=$PATH
157  ac_base_inc="include include/${ac_arch}-linux-gnu"  
158  for X in $ac_with_paths; do  for X in $ac_with_paths; do
159    if test -d $X/bin; then    if test -d $X/bin; then
160      ac_path="$X/bin:$ac_path"      ac_path="$X/bin:$ac_path"
161    fi    fi
162    if test -d $X/include; then    if test -d $X/include; then
163      for Y in $ac_qtdirs; do      for Y in include include/${ac_arch}-linux-gnu; do
164        for Z in $ac_base_inc; do        for Z in $ac_qtdirs; do
165          if test -d "$X/$Z/$Y"; then          if test -d "$X/$Y/$Z"; then
166            CFLAGS="-I$X/$Z/$Y $CFLAGS"            CFLAGS="-I$X/$Y/$Z $CFLAGS"
167            CPPFLAGS="-I$X/$Z/$Y $CPPFLAGS"            CPPFLAGS="-I$X/$Y/$Z $CPPFLAGS"
168            ac_incpath="$X/$Z/$Y $ac_incpath"            ac_incpath="$X/$Y/$Z $ac_incpath"
169          fi          fi
170        done        done
171      done      done

Legend:
Removed from v.2797  
changed lines
  Added in v.2823

  ViewVC Help
Powered by ViewVC