ports/x11/bino/patches/patch-configure_ac - diff

Return to patch-configure_ac CVS log

Up to [local] / ports / x11 / bino / patches

Diff for /ports/x11/bino/patches/Attic/patch-configure_ac between version 1.1.1.1 and 1.2

-version 1.1.1.1, 2011/03/09 05:12:35
+version 1.2, 2011/11/28 19:41:36
 Line 1
 Line 1
 Line 1
  $OpenBSD$
- --- configure.ac.orig   Sun Dec 19 08:49:33 2010
+ --- configure.ac.orig   Mon Oct 10 23:17:05 2011
- +++ configure.ac        Sun Dec 19 08:49:44 2010
+ +++ configure.ac        Mon Nov 28 17:51:15 2011
- @@ -80,7 +80,7 @@ AC_ARG_VAR([RCC], [rcc command])
+ @@ -141,7 +141,7 @@ dnl Qt
-  AC_CHECK_TOOLS([RCC], [rcc-qt4 rcc])
+  RCC=""
+  AC_ARG_VAR([RCC], [rcc command])
   MOC=""
-  AC_ARG_VAR([MOC], [moc command])
+ -AC_ARG_VAR([MOC], [moc command])
- -AC_CHECK_TOOLS([MOC], [moc-qt4 moc])
+ +AC_ARG_VAR([MOC], [moc4 command])
- +AC_CHECK_TOOLS([MOC], [moc-qt4 moc4])
+  PKG_CHECK_MODULES([libqtopengl], [QtOpenGL >= 0.0], [HAVE_LIBQTOPENGL=1], [HAVE_LIBQTOPENGL=0])
+  if test "$HAVE_LIBQTOPENGL" != "1"; then
-  dnl Equalizer
+      AC_MSG_WARN([required library QtOpenGL not found:])
-  dnl We assume that Equalizer includes GLEW. If we don't use Equalizer, we need GLEW separately.
+ @@ -149,7 +149,7 @@ if test "$HAVE_LIBQTOPENGL" != "1"; then
+      AC_MSG_WARN([QtOpenGL is provided by Qt; Debian package: libqt4-opengl-dev])
+  else
+      AC_CHECK_TOOLS([RCC], [rcc-qt4 rcc])
+ -    AC_CHECK_TOOLS([MOC], [moc-qt4 moc])
+ +    AC_CHECK_TOOLS([MOC], [moc-qt4 moc4])
+      if test -z "$RCC" -o -z "$MOC"; then
+          AC_MSG_WARN([required tools rcc and/or moc not found; QtOpenGL not usable])
+          HAVE_LIBQTOPENGL="0"

CVSweb