/[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 3404 by capela, Wed Jan 10 18:55:12 2018 UTC revision 3407 by capela, Wed Jan 10 21:27:30 2018 UTC
# Line 155  AC_PROG_CPP Line 155  AC_PROG_CPP
155  AC_PROG_CXX  AC_PROG_CXX
156  AC_PROG_CXXCPP  AC_PROG_CXXCPP
157    
158    # Checks for languages.
159    AC_LANG_CPLUSPLUS
160    
161  # Check for pkg-config.  # Check for pkg-config.
162  PKG_PROG_PKG_CONFIG  PKG_PROG_PKG_CONFIG
163    
# Line 181  if test "x$ac_arch" = "xx86_64"; then Line 184  if test "x$ac_arch" = "xx86_64"; then
184     ac_libdirs="$ac_libdirs lib64"     ac_libdirs="$ac_libdirs lib64"
185  fi  fi
186    
187    CFLAGS="-fPIC $CFLAGS"
188    CPPFLAGS="-fPIC $CPPFLAGS"
189    
190  # Prepend alternate dependencies paths.  # Prepend alternate dependencies paths.
191  for X in $ac_with_paths; do  for X in $ac_with_paths; do
192    if test -d $X/bin; then    if test -d $X/bin; then
193      ac_path="$X/bin:$ac_path"       ac_path="$X/bin:$ac_path"
194    fi    fi
195    if test -d $X/include; then    if test -d $X/include; then
196      CFLAGS="-I$X/include $CFLAGS "       CFLAGS="-I$X/include $CFLAGS "
197      CPPFLAGS="-I$X/include $CPPFLAGS"       CPPFLAGS="-I$X/include $CPPFLAGS"
198      ac_incpath="$X/include $ac_incpath"       ac_incpath="$X/include $ac_incpath"
199    fi    fi
200    for Y in $ac_libdirs; do    for Y in $ac_libdirs; do
201      if test -d $X/$Y; then       if test -d $X/$Y; then
202        LIBS="-L$X/$Y $LIBS"          LIBS="-L$X/$Y $LIBS"
203        ac_libs="-L$X/$Y $ac_libs"          ac_libs="-L$X/$Y $ac_libs"
204      fi       fi
205    done    done
206  done  done
207    
208  # A common error message:  # A common error message:
209  ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."  ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
210    
211  if test "x$ac_qt4" = "xyes"; then  # Check for proper qmake path/version alternatives.
212     AC_PATH_TOOL(ac_qmake, qmake-qt4, [no], $ac_path)  AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
213  else  
    AC_PATH_TOOL(ac_qmake, qmake-qt5, [no], $ac_path)  
 fi  
 if test "x$ac_qmake" = "xno"; then  
    AC_PATH_TOOL(ac_cv_qmake, qmake, [no], $ac_path)  
    ac_qmake=$ac_cv_qmake  
 fi  
214  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
215     AC_MSG_ERROR([qmake $ac_errmsg])     if test "x$ac_qt4" = "xyes"; then
216          AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)
217          ac_qmake=$ac_cv_qmake
218       else
219          AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
220          ac_qmake=$ac_cv_qmake
221       fi
222  fi  fi
223    
224  # Check for proper Qt major version.  # Check for proper Qt major version.
# Line 223  AC_CACHE_CHECK([for Qt major version], [ Line 229  AC_CACHE_CHECK([for Qt major version], [
229  ac_qt_version_major=$ac_cv_qt_version_major  ac_qt_version_major=$ac_cv_qt_version_major
230  if test "x$ac_qt4" = "xyes"; then  if test "x$ac_qt4" = "xyes"; then
231     if test $ac_qt_version_major -ne 4; then     if test $ac_qt_version_major -ne 4; then
232        AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])        AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)
233          ac_qmake=$ac_cv_qmake
234     fi     fi
235  else  else
236     if test $ac_qt_version_major -ne 5; then     if test $ac_qt_version_major -ne 5; then
237          AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
238          ac_qmake=$ac_cv_qmake
239       fi
240    fi
241    
242    if test "x$ac_qmake" = "xno"; then
243       if test "x$ac_qt4" = "xyes"; then
244          AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])
245       else
246        AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])        AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
247     fi     fi
248  fi  fi

Legend:
Removed from v.3404  
changed lines
  Added in v.3407

  ViewVC Help
Powered by ViewVC