--- extconf.rb.orig	Sun Jun 18 21:04:07 2000
+++ extconf.rb	Fri Aug 25 03:54:53 2000
@@ -12,40 +12,17 @@
 
 if( ARGV.include?("--help") )
   print <<EOF
-  --with-fltk            specify the fltk install prefix.
-  --with-fltk-incdir     specify the directory which contains fltk header files.
-  --with-fltk-libdir     specify the directory which contains fltk library.
-  --with-gl              specify the GL install prefix.
-  --with-gl-incdir       specify the directory which contains GL header files.
-  --with-gl-libdir       specify the directory which contains GL library.
+  --with-fltk-dir        specify the fltk install prefix.
+  --with-fltk-include    specify the directory which contains fltk header files.
+  --with-fltk-lib        specify the directory which contains fltk library.
+  --with-gl-dir          specify the GL install prefix.
+  --with-gl-include      specify the directory which contains GL header files.
+  --with-gl-lib          specify the directory which contains GL library.
 EOF
 end
 
-if( fltk_prefix = with_config("fltk") )
-  $CFLAGS  += " -I" + File.join(fltk_prefix,"include")
-  $LDFLAGS += " -L" + File.join(fltk_prefix,"lib")
-end
-
-if( fltk_incdir = with_config("fltk-incdir") )
-  $CFLAGS += " -I" + fltk_incdir
-end
-
-if( fltk_libdir = with_config("fltk-libdir") )
-  $LDFLAGS += " -L" + fltk_libdir
-end
-
-if( gl_prefix = with_config("gl") )
-  $CFLAGS  += " -I" + File.join(gl_prefix,"include")
-  $LDFLAGS += " -L" + File.join(gl_prefix,"lib")
-end
-
-if( gl_incdir = with_config("gl-incdir") )
-  $CFLAGS += " -I" + gl_incdir
-end
-
-if( gl_libdir = with_config("gl-libdir") )
-  $LDFLAGS += " -L" + gl_libdir
-end
+dir_config("fltk")
+dir_config("gl")
 
 if( have_header("FL/Fl.H") &&
    have_library("GL",nil) &&