Commit 49461444 authored by fogal1's avatar fogal1
Browse files

Make sure HAVE_XLIB propagates to code that needs it.

We AC_SUBSTituted it, but never had a variable for that target in
make-variables or anywhere else.  Plotter/vtk is the only code
that seems to use HAVE_XLIB, so the makefile for it now gets
X_CPPFLAGS.

Further, in one of our mappers which relies on the define being
set on Linux, add an #else clause with an error, so we'll detect
that nothing is happening instead silently doing the wrong thing.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8903 18c085ea-50e0-402c-830e-de6fd14e8384
parent d812c4ce
# generated automatically by aclocal 1.11 -*- Autoconf -*-
# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......
......@@ -190,6 +190,9 @@
# I moved the code from visit_vtk/rendering to here to avoid introducing
# a dependency on avtPlotter into visit_vtk/rendering.
#
# Tom Fogal, Fri Nov 6 18:01:11 MST 2009
# Add X_CPPFLAGS to compilation flags.
#
##############################################################################
##
......@@ -275,7 +278,7 @@ avtVolumeVariableLegend.C \
$(RENDERING_SRC)
CPPFLAGS=-Ivtk -I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@ $(GLEW_INCLUDE) \
@X_CPPFLAGS@
SEROBJ=$(SRC:.C=.o) $(SEROPENGL_OBJ) @SERMESA_OBJ@
PAROBJ=$(SRC:.C=_par.o) $(PAROPENGL_OBJ) @PARMESA_OBJ@
LIB=libplotter
......
......@@ -225,6 +225,9 @@ vtkRubberBandMapper2D::ReleaseGraphicsResources(vtkWindow *win)
// Use Qt to create the transparent overlay window on MacOS X if
// VTK_USE_COACOA is set.
//
// Tom Fogal, Fri Nov 6 18:01:42 MST 2009
// If no platform-specific implementation is available, give an error.
//
// ****************************************************************************
void vtkRubberBandMapper2D::RenderOverlay(vtkViewport* viewport, vtkActor2D* actor)
......@@ -526,6 +529,8 @@ CGContextMoveToPoint(overlay->ctx, X,H-(Y));
// Set the line color
double* actorColor = actor->GetProperty()->GetColor();
SET_FOREGROUND_D(actorColor);
#else
# error "No implementation defined!"
#endif
#if defined(_WIN32) || defined(__APPLE__) || defined(HAVE_XLIB)
......
......@@ -10879,7 +10879,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
 
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
......@@ -10887,7 +10887,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
......@@ -10914,7 +10914,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
 
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
......@@ -10928,18 +10928,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
int
main ()
{
XrmInitialize ()
XtMalloc (0)
;
return 0;
}
......
......@@ -88,6 +88,7 @@ ENGINEWRAPSER=@ENGINEWRAPSER@
ENGINEWRAPPAR=@ENGINEWRAPPAR@
BUILD_FORTRAN=@BUILD_FORTRAN@
X_LIBS=@X_LIBS@
X_CPPFLAGS=@X_CPPFLAGS@
AR=ar
RANLIB=@RANLIB@
INSTALL=@tmpbin@/install-sh -c -m 755
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment