[patch] orangefs-2.8.5-vis.patch

orangefs-2.8.5-vis.patch (text/plain), 2.35 KB, created by Andrew Savchenko on 2012-04-07 17:59:14 UTC

--- orangefs-2.8.5/configure.in.orig	2012-01-26 18:59:26.000000000 +0400
+++ orangefs-2.8.5/configure.in	2012-02-08 14:17:17.612385711 +0400
@@ -1082,30 +1082,43 @@
 
 dnl --
 dnl Check for SDL
-AC_MSG_CHECKING([for SDL])
-SDL_CONFIG=`which sdl-config 2> /dev/null`
-if ! test -z "$SDL_CONFIG" && test -x "$SDL_CONFIG"; then
-   AC_MSG_RESULT(yes)
-   SDL_VERSION=`sdl-config --version`
-   VISCFLAGS=`sdl-config --cflags`
-   VISCLIBS=`sdl-config --libs`
-
-   dnl We also need SDL ttf support
-   dnl only define BUILD_VIS if we have all required parts
-   AC_CHECK_HEADERS(SDL_ttf.h,
-       [BUILD_VIS="1"
-        CPPFLAGS="$CPPFLAGS $VISCFLAGS"],
-        [AC_CHECK_HEADERS(SDL/SDL_ttf.h,
-            [BUILD_VIS="1"
-            CPPFLAGS="$CPPFLAGS $VISCFLAGS"],)],
-)
-
-   AC_SUBST(BUILD_VIS)
-   AC_SUBST(VISCFLAGS)
-   AC_SUBST(VISLIBS)
-else
-   AC_MSG_RESULT(no)
+test_for_sdl()
+{
+  AC_MSG_CHECKING([for SDL])
+  SDL_CONFIG=`which sdl-config 2> /dev/null`
+  if ! test -z "$SDL_CONFIG" && test -x "$SDL_CONFIG"; then
+     AC_MSG_RESULT(yes)
+     SDL_VERSION=`sdl-config --version`
+     VISCFLAGS=`sdl-config --cflags`
+     VISCLIBS=`sdl-config --libs`
+
+     dnl We also need SDL ttf support
+     dnl only define BUILD_VIS if we have all required parts
+     AC_CHECK_HEADERS(SDL_ttf.h,
+         [BUILD_VIS="1"
+          CPPFLAGS="$CPPFLAGS $VISCFLAGS"],
+          [AC_CHECK_HEADERS(SDL/SDL_ttf.h,
+              [BUILD_VIS="1"
+              CPPFLAGS="$CPPFLAGS $VISCFLAGS"],)],
+  )
+
+     AC_SUBST(BUILD_VIS)
+     AC_SUBST(VISCFLAGS)
+     AC_SUBST(VISLIBS)
+  else
+     AC_MSG_RESULT(no)
+  fi
+}
+
+dnl optionally disable building visualisation tools
+AC_ARG_ENABLE(visual,
+[  --enable-visual         Enable visualisation tools. (Disabled by default, requires SDL)],
+[
+if test "x$enableval" = "xyes" ; then
+   test_for_sdl
 fi
+],
+)
 
 dnl Which form of strerror?
 AC_MSG_CHECKING([for GNU-style strerror_r])
@@ -1209,6 +1222,12 @@
    AC_MSG_RESULT([PVFS2 configured to build karma gui               :  no])
 fi
 
+if test "x$BUILD_VIS" = "x1" ; then
+   AC_MSG_RESULT([PVFS2 configured to build visualization tools     : yes])
+else
+   AC_MSG_RESULT([PVFS2 configured to build visualization tools     :  no])
+fi
+
 if test "x$ENABLE_COVERAGE" = "x1" -a "x$BUILD_BMI_ONLY" != "x1"; then
    AC_MSG_RESULT([PVFS2 configured to perform coverage analysis     : yes])
 else