Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22952
Modified Files:
ChangeLog configure.ac
Log Message:
Only recurse into lib/gtkglext if building openvrml-gtkplug.
Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** configure.ac 1 Oct 2006 05:46:54 -0000 1.94
--- configure.ac 5 Oct 2006 03:25:59 -0000 1.95
***************
*** 335,338 ****
--- 335,344 ----
AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])
AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])
+
+ if test X$enable_gtkplug != Xno; then
+ gtkglext_subdir=gtkglext
+ fi
+ AC_SUBST([gtkglext_subdir])
+
AC_CONFIG_SUBDIRS([lib/gtkglext mozilla-plugin])
Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -C2 -d -r1.1343 -r1.1344
*** ChangeLog 5 Oct 2006 03:15:49 -0000 1.1343
--- ChangeLog 5 Oct 2006 03:25:59 -0000 1.1344
***************
*** 1,4 ****
--- 1,13 ----
2006-10-04 Braden McDaniel <br...@en...>
+ Only recurse into lib/gtkglext if building openvrml-gtkplug.
+
+ * configure.ac: Added gtkglext_subdir substitution.
+ * lib/Makefile.am: Add gtkglext to SUBDIRS as a configure
+ substitution. We don't want to recurse there if we aren't
+ building openvrml-gtkplug.
+
+ 2006-10-04 Braden McDaniel <br...@en...>
+
* README: Updated package layout description to reflect
openvrml-gtkplug.
|