Changeset View
Changeset View
Standalone View
Standalone View
head/devel/subcommander2/files/patch-configure.ac
| Show First 20 Lines • Show All 143 Lines • ▼ Show 20 Lines | + [AC_LANG_PROGRAM( | ||||
| [[ | [[ | ||||
| unsigned long num = DB_VERSION_MAJOR; | unsigned long num = DB_VERSION_MAJOR; | ||||
| ]] | ]] | ||||
| - ), | - ), | ||||
| + )], | + )], | ||||
| [ | [ | ||||
| AC_MSG_RESULT([yes]) | AC_MSG_RESULT([yes]) | ||||
| AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) | AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) | ||||
| @@ -635,11 +624,11 @@ | @@ -635,7 +624,7 @@ | ||||
| QT_BIN="$qt_path/bin" | QT_BIN="$qt_path/bin" | ||||
| QT_PATH="$qt_path" | QT_PATH="$qt_path" | ||||
| - QT_LIBPATH="$qt_path/lib" | - QT_LIBPATH="$qt_path/lib" | ||||
| + QT_LIBPATH="$qt_path/lib/qt4" | + QT_LIBPATH="$qt_path/lib/qt4" | ||||
| # extract version numbers of qt | # extract version numbers of qt | ||||
| - QT_VERSION=`$QT_BIN/moc -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"` | |||||
| + QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"` | |||||
| QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[[.]].*[[.]].*/\1/"` | |||||
| QT_MINOR=`echo $QT_VERSION | sed "s/.*[[.]]\(.*\)[[.]].*/\1/"` | |||||
| @@ -669,7 +658,7 @@ | @@ -669,7 +658,7 @@ | ||||
| *) | *) | ||||
| # any other Unix platform directly link with the libs | # any other Unix platform directly link with the libs | ||||
| - QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt" | - QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt" | ||||
| + QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4" | + QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4" | ||||
| QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore" | QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore" | ||||
| ;; | ;; | ||||
| ▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines | |||||