/[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 2765 by capela, Sat May 23 12:37:34 2015 UTC revision 2766 by capela, Sat May 23 16:48:20 2015 UTC
# 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_topdirs="$ac_topdirs /usr/lib64"     ac_subdirs="$ac_subdirs 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 142  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 $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 155  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 170  for X in $ac_with_paths; do Line 170  for X in $ac_with_paths; do
170      CPPFLAGS="$CPPFLAGS -I$X/include"      CPPFLAGS="$CPPFLAGS -I$X/include"
171      ac_incpath="$ac_incpath $X/include"      ac_incpath="$ac_incpath $X/include"
172    fi    fi
173    if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then    for Y in $ac_subdirs; do
174      LIBS="-L$X/lib64 $LIBS"      if test -d $X/$Y; then
175      ac_libs="-L$X/lib64 $ac_libs"         LIBS="$LIBS -L$X/$Y"
176    fi         ac_libs="$ac_libs -L$X/$Y"
177    if test -d $X/lib; then      fi
178      LIBS="-L$X/lib $LIBS"    done
     ac_libs="-L$X/lib $ac_libs"  
   fi  
179  done  done
180    
181  # Check for proper Qt4/5 version.  # Check for proper Qt4/5 version.

Legend:
Removed from v.2765  
changed lines
  Added in v.2766

  ViewVC Help
Powered by ViewVC