@@ -405,6 +405,15 @@ case "${host}" in
405
405
fi
406
406
;;
407
407
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
+
408
417
*freebsd*)
409
418
QT_LIBS="$QT_LIB"
410
419
if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
@@ -508,6 +517,7 @@ AC_SUBST(QASSISTANTCLIENT_LDADD)
508
517
AC_SUBST ( QTDIR )
509
518
] )
510
519
520
+
511
521
dnl ------------------------------------------------------------------------
512
522
dnl
513
523
dnl improved Qt4 check
@@ -517,25 +527,22 @@ dnl
517
527
dnl ------------------------------------------------------------------------
518
528
519
529
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" )
529
536
530
537
if test "$QT_PKG_CONFIG" = "y" ; then
531
-
538
+
532
539
dnl ---------------------------------------------------------------------------
533
540
dnl we will use PKGCONFIG, check that all needed Qt4 components are there
534
541
dnl ---------------------------------------------------------------------------
535
542
536
543
QT_MIN_VER=4.1.0
537
544
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)
539
546
540
547
dnl check for Qt binaries needed for compilation: moc,uic,rcc
541
548
dnl (we could also check for moc and uic versions)
@@ -555,7 +562,7 @@ AC_DEFUN([AQ_CHECK_QT4],[
555
562
556
563
dnl workaround for case when QtTest doesn't report QtTest subdirectory
557
564
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)
559
566
QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t] *$//'` # remove trailing spaces
560
567
QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l`
561
568
if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then
@@ -802,7 +809,7 @@ AC_MSG_CHECKING(for python build information)
802
809
python_prefix=/System/Library/Frameworks/Python.framework/*/
803
810
fi
804
811
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,,`] ] ,
806
813
ax_python_header=no )
807
814
if test $ax_python_lib != no; then
808
815
if test $ax_python_header != no; then
0 commit comments