summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-07-18 07:40:41 -0700
committerDan Nicholson <dbn.lists@gmail.com>2008-07-18 08:07:07 -0700
commit776c60d3c33b05f59181a2052a9f03147bc51111 (patch)
treee54f7793b10d40280065a25cd50d00e31a9f0b71 /configs
parentb4b7326717d3253656f9702fc04f06f8d210a6aa (diff)
autoconf: Support Motif widgets in GLw with --enable-motif
Add an --enable-motif option, which will enable the Motif widgets in libGLw and link it with libXm. The Motif installation information will be gathered from the motif-config script (this comes with LessTif) or fallback to the standard autoconf checks. To allow the location of the Motif headers to be set from configure, the default setting of -I/usr/include/Motif1.2 has been moved into configs/default and then passed to the Makefile through the MOTIF_CFLAGS variable.
Diffstat (limited to 'configs')
-rw-r--r--configs/autoconf.in4
-rw-r--r--configs/default1
2 files changed, 5 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 8ed1c93d11..a3eaed5c9d 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -66,6 +66,10 @@ USING_EGL = @USING_EGL@
# Dependencies
X11_INCLUDES = @X11_INCLUDES@
+# GLw motif setup
+GLW_SOURCES = @GLW_SOURCES@
+MOTIF_CFLAGS = @MOTIF_CFLAGS@
+
# Library/program dependencies
GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
diff --git a/configs/default b/configs/default
index 36dc483c9a..31ba2f62a0 100644
--- a/configs/default
+++ b/configs/default
@@ -61,6 +61,7 @@ ASM_SOURCES =
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
# order to build the Motif widget too)
GLW_SOURCES = GLwDrawA.c
+MOTIF_CFLAGS = -I/usr/include/Motif1.2
# Directories to build