--- setup.py	2000/12/12 14:56:17	1.1
+++ setup.py	2000/12/12 15:22:46
@@ -68,6 +68,19 @@
 
 
 #----------------------------------------------------------------------
+# Check for some environment variables
+#----------------------------------------------------------------------
+
+try: gtk_config = os.environ['GTK_CONFIG']
+except KeyError: gtk_config = 'gtk-config'
+
+try: wx_config = os.environ['WX_CONFIG']
+except KeyError: wx_config = 'wx-config'
+
+try: sys_libs = string.split(os.environ['LIBS'])
+except KeyError: sys_libs = []
+
+#----------------------------------------------------------------------
 # Check for build flags on the command line
 #----------------------------------------------------------------------
 
@@ -172,12 +185,13 @@
                ]
     libdirs = []
     libs = []
+    libs.extend(sys_libs)
 
-    cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
-             os.popen('gtk-config --cflags', 'r').read()[:-1]
+    cflags = os.popen(wx_config + ' --cflags', 'r').read()[:-1] + ' ' + \
+             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
     cflags = string.split(cflags)
 
-    lflags = os.popen('wx-config --libs', 'r').read()[:-1]
+    lflags = os.popen(wx_config + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)