patch-configure 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. $OpenBSD: patch-configure,v 1.3 2014/09/21 17:32:41 brad Exp $
  2. --- configure.orig Sun Oct 8 16:40:01 2006
  3. +++ configure Mon Sep 15 11:47:13 2014
  4. @@ -2457,9 +2457,9 @@ echo "${ECHO_T}" >&6
  5. for dir in $mysql_lib; do
  6. if test "x$mysql_found" != "xyes"
  7. then
  8. - as_ac_File=`echo "ac_cv_file_"$dir/libmysqlclient.so"" | $as_tr_sh`
  9. -echo "$as_me:$LINENO: checking for \"$dir/libmysqlclient.so\"" >&5
  10. -echo $ECHO_N "checking for \"$dir/libmysqlclient.so\"... $ECHO_C" >&6
  11. + as_ac_File=`echo "ac_cv_file_"$dir/libmysqlclient.a"" | $as_tr_sh`
  12. +echo "$as_me:$LINENO: checking for \"$dir/libmysqlclient.a\"" >&5
  13. +echo $ECHO_N "checking for \"$dir/libmysqlclient.a\"... $ECHO_C" >&6
  14. if eval "test \"\${$as_ac_File+set}\" = set"; then
  15. echo $ECHO_N "(cached) $ECHO_C" >&6
  16. else
  17. @@ -2467,7 +2467,7 @@ else
  18. { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
  19. echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
  20. { (exit 1); exit 1; }; }
  21. -if test -r ""$dir/libmysqlclient.so""; then
  22. +if test -r ""$dir/libmysqlclient.a""; then
  23. eval "$as_ac_File=yes"
  24. else
  25. eval "$as_ac_File=no"
  26. @@ -2484,7 +2484,7 @@ fi
  27. if test "x$mysql_found" = "xyes"
  28. then
  29. LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
  30. - MYSQL_LIB="$dir/libmysqlclient.so $LIBZ_LIB"
  31. + MYSQL_LIB="-lmysqlclient $LIBZ_LIB"
  32. echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
  33. echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6
  34. @@ -3184,7 +3184,7 @@ fi
  35. echo "$as_me:$LINENO: checking \"if Qt Version in $QTDIR is >= 3.0.5\"" >&5
  36. echo $ECHO_N "checking \"if Qt Version in $QTDIR is >= 3.0.5\"... $ECHO_C" >&6
  37. -CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
  38. +CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include/X11/qt3"
  39. cat >conftest.$ac_ext <<_ACEOF
  40. #line $LINENO "configure"
  41. #include "confdefs.h"
  42. @@ -4078,7 +4078,7 @@ else
  43. fi
  44. echo "Creating Makefile with qmake"
  45. -QMAKESPEC=$QMAKESPEC QTDIR=$QTDIR $QTDIR/bin/qmake mysqlcc.pro
  46. +QMAKESPEC=$FILESDIR QTDIR=$QTDIR $QTDIR/bin/qmake-mt mysqlcc.pro
  47. if test ! $? = 0 ; then
  48. echo "qmake failed, aborting"
  49. exit 1