diff options
Diffstat (limited to 'deskutils/google-gadgets/files/patch-configure.ac')
| -rw-r--r-- | deskutils/google-gadgets/files/patch-configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/deskutils/google-gadgets/files/patch-configure.ac b/deskutils/google-gadgets/files/patch-configure.ac index c5a1be701e95..027e4c820532 100644 --- a/deskutils/google-gadgets/files/patch-configure.ac +++ b/deskutils/google-gadgets/files/patch-configure.ac @@ -3,7 +3,7 @@ $FreeBSD$ --- configure.ac.orig +++ configure.ac -@@ -334,6 +334,13 @@ +@@ -371,6 +371,13 @@ GGL_PLATFORM_SHORT=\"linux\" GGL_PLATFORM=\"linux\" ;; @@ -17,7 +17,7 @@ $FreeBSD$ *solaris* ) ggl_host_type=solaris PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1" -@@ -352,6 +359,7 @@ +@@ -389,6 +396,7 @@ AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx]) AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux]) AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris]) @@ -25,12 +25,12 @@ $FreeBSD$ AC_SUBST(PREDEFINED_MACROS) AC_SUBST(DEFAULT_COMPILE_FLAGS) -@@ -445,7 +453,7 @@ - fi - - # Check qt4 +@@ -489,7 +497,7 @@ + has_qtnetwork=no + has_qtwebkit=no + has_qtscript=no -if test x$ggl_host_type = xlinux; then +if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then - PKG_CHECK_MODULES(QT4, [QtGui >= 4.3, QtCore >= 4.3, QtOpenGL >= 4.3, - QtNetwork >= 4.3], + PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3], [has_qt4=yes + MOC=`$PKG_CONFIG --variable=moc_location QtCore`], |