fixing glut.h stuff

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index ae4a45f3f20ceff02e84ca12d7758869c8a3b489..0e0493bd55479d6515d2545a519c1d9ca05d0c4a 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/neatogen \
         -I$(top_srcdir)/cmd/smyrna/gui \
-       $(GTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS)
+       $(GTK_CFLAGS) $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS)
 
 noinst_HEADERS = btree.h draw.h filter.h glexpose.h glmotion.h gltemplate.h \
        hier.h materials.h selection.h smyrnadefs.h support.h topview.h \
@@ -38,7 +38,7 @@ smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
                $(top_builddir)/lib/topfish/libtopfish_C.la \
                $(top_builddir)/lib/common/libcommon_C.la \
                $(top_builddir)/lib/neatogen/libneatogen_C.la \
-               $(GTK_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) \
+               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) \
                $(EXTRA_SMYRNA_LDFLAGS)
 
 EXTRA_DIST = smyrna.vcproj

diff --git a/configure.ac b/configure.ac
index 43204c0478ff4a8cfc4d4c7daea9fe459b78c658..565322f95a19d9d30e8e7bb1200e185dfe4b5dc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2454,11 +2454,11 @@ if test "x$with_glut" != "xyes"; then
 else
   save_CPPFLAGS=$CPPFLAGS
   save_LDFLAGS=$LDFLAGS
-  GLUT_INCLUDES="-I/usr/include/GL"
+  GLUT_CFLAGS="-I/usr/include/GL"
   AC_ARG_WITH(glutincludedir,
     [AS_HELP_STRING([--with-glutincludedir=DIR],[use GLUT includes from DIR])],
-    [GLUT_INCLUDES="-I$withval"])
-  CPPFLAGS="$CPPFLAGS $GLUT_INCLUDES"
+    [GLUT_CFLAGS="-I$withval"])
+  CPPFLAGS="$CPPFLAGS $GLUT_CFLAGS"
   AC_ARG_WITH(glutlibdir,
     [AS_HELP_STRING([--with-glutlibdir=DIR],[use GLUT libraries from DIR])],
     [GLUT_LIBS="-L$withval"])
@@ -2478,7 +2478,7 @@ fi
 
 LDFLAGS=$save_LDFLAGS
 CPPFLAGS=$save_CPPFLAGS
-AC_SUBST(GLUT_INCLUDES)
+AC_SUBST(GLUT_CFLAGS)
 AC_SUBST(GLUT_LIBS)
 
 dnl -----------------------------------