diff --git a/configure.in b/configure.in
index 2dd90d6..6fffa79 100644
--- a/configure.in
+++ b/configure.in
@@ -19,12 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 dnl
 dnl The GNU folks apparently haven't heard that some people don't use
 dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
-m4_define([info], [doc])
-m4_define([infodir], [docdir])
 AC_INIT([PostgreSQL], [7.3.19], [pgsql-bugs@postgresql.org])
-m4_undefine([infodir])
-m4_undefine([info])
-AC_SUBST(docdir)
 
 AC_PREREQ(2.53)
 AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group])
@@ -623,7 +618,7 @@ AC_CHECK_LIB(PW,       main)
 AC_CHECK_LIB(resolv,   main)
 AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
 # QNX:
-AC_CHECK_LIB([[unix]], main)
+AC_CHECK_LIB([unix], main)
 AC_SEARCH_LIBS(crypt,  crypt)
 # BeOS:
 AC_CHECK_LIB(bind,     __inet_ntoa)