/[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 2829 by capela, Thu Jul 23 17:32:31 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 132  if test "x$ac_qt5" = "xyes"; then Line 131  if test "x$ac_qt5" = "xyes"; then
131  fi  fi
132    
133  ac_topdirs="/usr/local /usr"  ac_topdirs="/usr/local /usr"
134  ac_subdirs="lib"  ac_libdirs="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"     ac_libdirs="$ac_libdirs lib64"
138  fi  fi
139    
140  if test "x$ac_arch" = "xx86_64" -o "x$ac_qt5" = "xyes"; then  if test "x$ac_arch" = "xx86_64" -o "x$ac_qt5" = "xyes"; then
# Line 144  if test "x$ac_arch" = "xx86_64" -o "x$ac Line 143  if test "x$ac_arch" = "xx86_64" -o "x$ac
143  fi  fi
144    
145  for X in $ac_topdirs; do  for X in $ac_topdirs; do
146    for Y in share $ac_subdirs; do    for Y1 in share $ac_libdirs; do
147      for Z in $ac_qtdirs; do      for Y2 in $Y1 $Y1/${ac_arch}-linux-gnu; do
148        if test -d $X/$Y/$Z/bin; then        for Z in $ac_qtdirs; do
149           ac_with_paths="$X/$Y/$Z $ac_with_paths"          if test -d $X/$Y2/$Z/bin; then
150        fi             ac_with_paths="$ac_with_paths $X/$Y2/$Z"
151            fi
152          done
153      done      done
154    done    done
155  done  done
156    
157  # Prepend alternate dependencies paths.  # Prepend alternate dependencies paths.
158  ac_path=$PATH  ac_path=$PATH
159  ac_base_inc="include include/${ac_arch}-linux-gnu"  
160  for X in $ac_with_paths; do  for X in $ac_with_paths; do
161    if test -d $X/bin; then    if test -d $X/bin; then
162      ac_path="$X/bin:$ac_path"      ac_path="$X/bin:$ac_path"
163    fi    fi
164    if test -d $X/include; then    if test -d $X/include; then
165      for Y in $ac_qtdirs; do      for Y in include include/${ac_arch}-linux-gnu; do
166        for Z in $ac_base_inc; do        for Z in $ac_qtdirs; do
167          if test -d "$X/$Z/$Y"; then          if test -d "$X/$Y/$Z"; then
168            CFLAGS="-I$X/$Z/$Y $CFLAGS"            CFLAGS="-I$X/$Y/$Z $CFLAGS"
169            CPPFLAGS="-I$X/$Z/$Y $CPPFLAGS"            CPPFLAGS="-I$X/$Y/$Z $CPPFLAGS"
170            ac_incpath="$X/$Z/$Y $ac_incpath"            ac_incpath="$X/$Y/$Z $ac_incpath"
171          fi          fi
172        done        done
173      done      done
# Line 174  for X in $ac_with_paths; do Line 175  for X in $ac_with_paths; do
175      CPPFLAGS="$CPPFLAGS -I$X/include"      CPPFLAGS="$CPPFLAGS -I$X/include"
176      ac_incpath="$ac_incpath $X/include"      ac_incpath="$ac_incpath $X/include"
177    fi    fi
178    for Y in $ac_subdirs; do    for Y1 in $ac_libdirs; do
179      if test -d $X/$Y; then      for Y2 in $Y1 $Y1/${ac_arch}-linux-gnu; do
180         LIBS="-L$X/$Y $LIBS"        if test -d $X/$Y2; then
181         ac_libs="-L$X/$Y $ac_libs"           LIBS="-L$X/$Y2 $LIBS"
182      fi           ac_libs="-L$X/$Y2 $ac_libs"
183          fi
184        done
185    done    done
186  done  done
187    

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

  ViewVC Help
Powered by ViewVC