--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.190 $)
+AC_REVISION($Revision: 1.192 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -678,13 +678,13 @@
 OCTAVE_SMART_PUTENV
 OCTAVE_PROGRAM_INVOCATION_NAME
 
-DLFCN_LIB=
-DLFCN_INCLUDE=
+LIBDLFCN=
+DLFCN_INCFLAGS=
 if test "$WITH_DL" = yes || test "$WITH_DL" = maybe; then
   case "$canonical_host_type" in
     rs6000-ibm-aix* | powerpc-ibm-aix*)
-      DLFCN_LIB='$TOPDIR/dlfcn/dlfcn.a'
-      DLFCN_INCLUDE='-L$top_srcdir/dlfcn -L$TOPDIR/dlfcn'
+      LIBDLFCN=-ldlfcn
+      DLFCN_INCFLAGS='-I$(top_srcdir)/dlfcn -I$(TOPDIR)/dlfcn'
       WITH_DL=true
     ;;
     *)
@@ -710,8 +710,8 @@
   WITH_DL=false
 fi
 AC_SUBST(WITH_DL)
-AC_SUBST(DLFCN_LIB)
-AC_SUBST(DLFCN_INCLUDE)
+AC_SUBST(LIBDLFCN)
+AC_SUBST(DLFCN_INCFLAGS)
 
 if test "$WITH_SHL" = yes || test "$WITH_SHL" = maybe; then
   AC_CHECK_LIB(dld, shl_load)
@@ -1016,12 +1016,11 @@
 export CXX
 export F77
 
-AC_CONFIG_SUBDIRS(glob kpathsea scripts $INFO_DIR $PLPLOT_DIR
-		  $READLINE_DIR $DLFCN_DIR)
+AC_CONFIG_SUBDIRS(glob kpathsea scripts $INFO_DIR $PLPLOT_DIR $READLINE_DIR)
 
 ### Do the substitutions in all the Makefiles.
 
-AC_OUTPUT(Makefile octMakefile Makeconf test/Makefile
+AC_OUTPUT(Makefile octMakefile Makeconf test/Makefile dlfcn/Makefile
 	  doc/Makefile doc/faq/Makefile doc/interpreter/Makefile
 	  doc/liboctave/Makefile doc/refcard/Makefile
 	  liboctave/Makefile src/Makefile src/mk-oct-links