[openvrml-commit] openvrml configure.ac,1.92.2.1.2.1,1.92.2.1.2.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32443

Modified Files:
      Tag: OpenVRML-GtkPlug-BRANCH
	configure.ac 
Log Message:
Added --disable-gtkplug configure option.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92.2.1.2.1
retrieving revision 1.92.2.1.2.2
diff -C2 -d -r1.92.2.1.2.1 -r1.92.2.1.2.2
*** configure.ac	27 Sep 2006 06:35:17 -0000	1.92.2.1.2.1
--- configure.ac	1 Oct 2006 02:40:56 -0000	1.92.2.1.2.2
***************
*** 274,292 ****
  
  #
! # build Mozilla plug-in
  #
! AC_ARG_ENABLE([mozilla-plugin],
!               [AC_HELP_STRING([--disable-mozilla-plugin],
!                               [do not build the Mozilla plug-in])])
! if test X$enable_mozilla_plugin != Xno; then
!   if test X$enable_gl_renderer = Xno; then
!     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GL renderer])
!   fi
! fi
! 
  if test X$enable_gtkplug != Xno; then
    if test X$have_gtk = Xno; then
      AC_MSG_FAILURE([GTK+ is required to build the GtkPlug])
    fi
  fi
  AM_CONDITIONAL([ENABLE_GTKPLUG],
--- 274,289 ----
  
  #
! # build the GtkPlug
  #
! AC_ARG_ENABLE([gtkplug],
!               [AC_HELP_STRING([--disable-gtkplug],
!                               [do not build the GtkPlug application])])
  if test X$enable_gtkplug != Xno; then
    if test X$have_gtk = Xno; then
      AC_MSG_FAILURE([GTK+ is required to build the GtkPlug])
    fi
+   if test X$enable_gl_renderer = Xno; then
+     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GL renderer])
+   fi
  fi
  AM_CONDITIONAL([ENABLE_GTKPLUG],
***************
*** 294,297 ****
--- 291,306 ----
  
  #
+ # build Mozilla plug-in
+ #
+ AC_ARG_ENABLE([mozilla-plugin],
+               [AC_HELP_STRING([--disable-mozilla-plugin],
+                               [do not build the Mozilla plug-in])])
+ if test X$enable_mozilla_plugin != Xno; then
+   if test X$enable_gtkplug = Xno; then
+     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GtkPlug application])
+   fi
+ fi
+ 
+ #
  # build examples
  #