Browse Source

Remove --with-glw switch

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32755 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 17 years ago
parent
commit
fa4d1c2d01
4 changed files with 811 additions and 1561 deletions
  1. 811 1503
      configure
  2. 0 50
      configure.in
  3. 0 2
      include/Make/Platform.make.in
  4. 0 6
      include/config.h.in

File diff suppressed because it is too large
+ 811 - 1503
configure


+ 0 - 50
configure.in

@@ -192,7 +192,6 @@ LOC_ARG_WITH(lapack, LAPACK, no)
 LOC_ARG_WITH(motif, Motif, no)
 LOC_ARG_WITH(cairo, Cairo, no)
 LOC_ARG_WITH(freetype, FreeType, no)
-LOC_ARG_WITH(glw, GLw, no)
 LOC_ARG_WITH(nls, NLS, no)
 LOC_ARG_WITH(readline, Readline, no)
 LOC_ARG_WITH(opendwg, openDWG, no)
@@ -267,9 +266,6 @@ LOC_ARG_WITH_LIB(motif, Motif)
 LOC_ARG_WITH_INC(freetype, FreeType)
 LOC_ARG_WITH_LIB(freetype, FreeType)
 
-LOC_ARG_WITH_INC(glw, GLw)
-LOC_ARG_WITH_LIB(glw, GLw)
-
 LOC_ARG_WITH_INC(proj, External PROJ.4)
 LOC_ARG_WITH_LIB(proj, External PROJ.4)
 LOC_ARG_WITH_SHARE(proj, External PROJ.4)
@@ -1397,51 +1393,6 @@ AC_SUBST(USE_CAIRO)
 
 # Done checking Cairo
 
-# Enable GLw option
-
-LOC_CHECK_USE(glw,GLw,USE_GLW)
-
-OPENGLWINC=
-OPENGLWM=
-
-if test -n "$USE_GLW"; then
-
-# With GLw includes directory
-
-LOC_CHECK_INC_PATH(glw,GLw,OPENGLWINC)
-
-LOC_CHECK_INCLUDES(GL/GLwMDrawA.h,GLwM,$OPENGLWINC $XMINC $X_CFLAGS $OPENGLINC,[
-LOC_CHECK_INCLUDES(X11/GLw/GLwMDrawA.h,GLwM,,)
-])
-
-# With GLw library directory
-
-LOC_CHECK_LIB_PATH(glw,GLw,OPENGLWM)
-
-LOC_CHECK_LIBS(GLw,     GLwCreateMDrawingArea, GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(GLw,     GLwCreateM1DrawingArea,GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(GLw,     GLwCreateM2DrawingArea,GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(GLwM,    GLwCreateMDrawingArea, GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(GLwM,    GLwCreateM1DrawingArea,GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(GLwM,    GLwCreateM2DrawingArea,GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(MesaGLw, GLwCreateMDrawingArea, GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-LOC_CHECK_LIBS(MesaGLwM,GLwCreateMDrawingArea, GLwM,$OPENGLWM $XMLIB $OPENGL_LIB_PATH,OPENGLWM,$X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,[
-], $OPENGLULIB)
-], $OPENGLULIB)
-])
-])
-])
-])
-])
-])
-
-fi # $USE_OPENGL && $USE_MOTIF
-
-AC_SUBST(OPENGLWINC)
-AC_SUBST(OPENGLWM)
-
-# Done checking GLw
-
 # Enable FreeType option
 
 LOC_CHECK_USE(freetype,FreeType,USE_FREETYPE)
@@ -1729,7 +1680,6 @@ LOC_MSG_USE(FFMPEG support,USE_FFMPEG)
 LOC_MSG_USE(FFTW support,USE_FFTW)
 LOC_MSG_USE(FreeType support,USE_FREETYPE)
 LOC_MSG_USE(GDAL support,USE_GDAL)
-LOC_MSG_USE(GLw support,USE_GLW)
 LOC_MSG_USE(JPEG support,USE_JPEG)
 LOC_MSG_USE(LAPACK support,USE_LAPACK)
 LOC_MSG_USE(Large File support (LFS), USE_LARGEFILES)

+ 0 - 2
include/Make/Platform.make.in

@@ -163,10 +163,8 @@ TIFFLIB             = @TIFFLIB@
 
 #openGL files for NVIZ/r3.showdspf
 OPENGLINC           = @OPENGLINC@
-OPENGLWINC          = @OPENGLWINC@
 OPENGLLIB           = @OPENGLLIB@
 OPENGLULIB          = @OPENGLULIB@
-OPENGLWM            = @OPENGLWM@
 OPENGL_X11          = @OPENGL_X11@
 OPENGL_AQUA         = @OPENGL_AQUA@
 OPENGL_WINDOWS      = @OPENGL_WINDOWS@

+ 0 - 6
include/config.h.in

@@ -200,12 +200,6 @@
 /* define if NLS requested */
 #undef USE_NLS
 
-/* define if <GL/GLwMDrawA.h> exists */
-#undef HAVE_GL_GLWMDRAWA_H
-
-/* define if <X11/GLw/GLwMDrawA.h> exists */
-#undef HAVE_X11_GLW_GLWMDRAWA_H
-
 /* define if TclTk exists */
 #undef HAVE_TCLTK