Skip to content

Commit fd5be4e

Browse files
author
g_j_m
committed
Apply patch submitted in ticket #388. Thanks.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6086 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3d42fcc commit fd5be4e

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

acinclude.m4

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,15 @@ case "${host}" in
405405
fi
406406
;;
407407
408+
*netbsd*)
409+
QT_LIBS="$QT_LIB"
410+
if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
411+
QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lpthread"
412+
else
413+
QT_LIBS="$QT_LIBS -lpthread"
414+
fi
415+
;;
416+
408417
*freebsd*)
409418
QT_LIBS="$QT_LIB"
410419
if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
@@ -508,6 +517,7 @@ AC_SUBST(QASSISTANTCLIENT_LDADD)
508517
AC_SUBST(QTDIR)
509518
])
510519

520+
511521
dnl ------------------------------------------------------------------------
512522
dnl
513523
dnl improved Qt4 check
@@ -517,25 +527,22 @@ dnl
517527
dnl ------------------------------------------------------------------------
518528

519529
AC_DEFUN([AQ_CHECK_QT4],[
520-
521-
# Commented, it is defined above
522-
# AC_ARG_WITH([qtdir], AC_HELP_STRING([--with-qtdir=DIR],[Qt4 installation directory]),
523-
# QTDIR="$withval", QTDIR="")
524-
525-
# WARNING: PKG_CHECK_MODULES fails on many systems (not defined) => commented
526-
# AC_ARG_WITH([qt-pkg-config], AC_HELP_STRING([--with-qt-pkg-config],
527-
# [Detect Qt4 directory using pkg-config instead of using --with-qtdir. Works only with Qt4 version for X11.]),
528-
# QT_PKG_CONFIG="y", QT_PKG_CONFIG="n")
530+
531+
AC_ARG_WITH([qtdir], AC_HELP_STRING([--with-qtdir=DIR],[Qt4 installation directory]),
532+
QTDIR="$withval", QTDIR="")
533+
AC_ARG_WITH([qt-pkg-config], AC_HELP_STRING([--with-qt-pkg-config],
534+
[Detect Qt4 directory using pkg-config instead of using --with-qtdir. Works only with Qt4 version for X11.]),
535+
QT_PKG_CONFIG="y", QT_PKG_CONFIG="n")
529536
530537
if test "$QT_PKG_CONFIG" = "y" ; then
531-
538+
532539
dnl ---------------------------------------------------------------------------
533540
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
534541
dnl ---------------------------------------------------------------------------
535542
536543
QT_MIN_VER=4.1.0
537544
538-
#PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER)
545+
dnl PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER)
539546
540547
dnl check for Qt binaries needed for compilation: moc,uic,rcc
541548
dnl (we could also check for moc and uic versions)
@@ -555,7 +562,7 @@ AC_DEFUN([AQ_CHECK_QT4],[
555562
556563
dnl workaround for case when QtTest doesn't report QtTest subdirectory
557564
dnl in include path (this is not a very nice check)
558-
#PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER)
565+
dnl PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER)
559566
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces
560567
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l`
561568
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then
@@ -802,7 +809,7 @@ AC_MSG_CHECKING(for python build information)
802809
python_prefix=/System/Library/Frameworks/Python.framework/*/
803810
fi
804811
AC_CHECK_HEADER([$ax_python_bin/Python.h],
805-
[[ax_python_header=`locate $python_prefix$ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
812+
[[ax_python_header=`locate $python_prefix$ax_python_bin/Python.h | head -1 | sed -e s,/Python.h,,`]],
806813
ax_python_header=no)
807814
if test $ax_python_lib != no; then
808815
if test $ax_python_header != no; then

0 commit comments

Comments
 (0)