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