/[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 2779 by capela, Mon Jun 15 14:11:33 2015 UTC revision 2797 by schoenebeck, Fri Jul 17 16:50:22 2015 UTC
# Line 32  AC_SUBST(ac_debug) Line 32  AC_SUBST(ac_debug)
32    
33  # Enable Qt4/5 availability.  # Enable Qt4/5 availability.
34  AC_ARG_ENABLE(qt4,  AC_ARG_ENABLE(qt4,
35    AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=yes)]),    AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]),
36    [ac_qt4="$enableval"],    [ac_qt4="$enableval"],
37    [ac_qt4="yes"])    [ac_qt4="no"])
38    
39  AC_ARG_ENABLE(qt5,  AC_ARG_ENABLE(qt5,
40    AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=no)]),    AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=yes)]),
41    [ac_qt5="$enableval"],    [ac_qt5="$enableval"],
42    [ac_qt5="no"])    [ac_qt5="yes"])
43    
44    
45    
# 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" = "xno"; then  if test "x$ac_qt4" != "xyes"; then
85     ac_qt5="yes"     ac_qt5="yes"
 fi  
 if test "x$ac_qt5" = "xyes"; then  
86     ac_qt4="no"     ac_qt4="no"
87    else
88       ac_qt5="no"
89       ac_qt4="yes"
90  fi  fi
91    
92  # Set for alternate liblscp installation dir.  # Set for alternate liblscp installation dir.
# Line 154  done Line 155  done
155    
156  # Prepend alternate dependencies paths.  # Prepend alternate dependencies paths.
157  ac_path=$PATH  ac_path=$PATH
158    ac_base_inc="include include/${ac_arch}-linux-gnu"
159  for X in $ac_with_paths; do  for X in $ac_with_paths; do
160    if test -d $X/bin; then    if test -d $X/bin; then
161      ac_path="$X/bin:$ac_path"      ac_path="$X/bin:$ac_path"
162    fi    fi
163    if test -d $X/include; then    if test -d $X/include; then
164      for Y in $ac_qtdirs; do      for Y in $ac_qtdirs; do
165        if test -d $X/include/$Y; then        for Z in $ac_base_inc; do
166          CFLAGS="-I$X/include/$Y $CFLAGS"          if test -d "$X/$Z/$Y"; then
167          CPPFLAGS="-I$X/include/$Y $CPPFLAGS"            CFLAGS="-I$X/$Z/$Y $CFLAGS"
168          ac_incpath="$X/include/$Y $ac_incpath"            CPPFLAGS="-I$X/$Z/$Y $CPPFLAGS"
169        fi            ac_incpath="$X/$Z/$Y $ac_incpath"
170            fi
171          done
172      done      done
173      CFLAGS="$CFLAGS -I$X/include"      CFLAGS="$CFLAGS -I$X/include"
174      CPPFLAGS="$CPPFLAGS -I$X/include"      CPPFLAGS="$CPPFLAGS -I$X/include"
Legend:
Removed from v.2779  
changed lines
  Added in v.2797
  ViewVC Help
Powered by ViewVC