added MESA_FX_NO_SIGNALS env var (Michael Vance)

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index ba996cabf4c..0b96cf4399a 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -1057,7 +1057,8 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,
 
    /* install signal handlers */
 #if defined(__linux__)
-   if (fxMesa->glCtx->CatchSignals) {
+   /* Only install if environment var. is not set. */
+   if (fxMesa->glCtx->CatchSignals && !getenv("MESA_FX_NO_SIGNALS")) {
       signal(SIGINT,cleangraphics_handler);
       signal(SIGHUP,cleangraphics_handler);
       signal(SIGPIPE,cleangraphics_handler);
@@ -1300,7 +1301,10 @@ int GLAPIENTRY fxQueryHardware(void)
 #if defined(__WIN32__)
     onexit((_onexit_t)cleangraphics);
 #elif defined(__linux__)
-    atexit(cleangraphics);
+    /* Only register handler if environment variable is not defined. */
+    if (!getenv("MESA_FX_NO_SIGNALS")) {
+	atexit(cleangraphics);
+    }
 #endif
   }