--- doc/mk-agen-texi-in.orig
+++ doc/mk-agen-texi-in
@@ -102,9 +102,9 @@ setup_exports()
   srcdir=`cd @srcdir@ ; pwd`
   PATH=${top_builddir}/columns:${PATH}
   timer=`expr @AG_TIMEOUT@ '*' 5`
-  d=`find ${top_builddir}/autoopts -type f -name libopts.a -print`
-  test -f "$d" || die "Cannot locate libopts.a"
-  LIBS="$d ${LIBS}"
+  d=`find ${top_builddir}/autoopts -type f -name libopts.a -o -name libopts.so | head -n 1`
+  LIBS="-L`dirname \"$d\"` -lopts ${LIBS}"
+  LD_LIBRARY_PATH="`dirname \"$d\"`:$LD_LIBRARY_PATH"
 
   eval `egrep '^AG_[A-Z_]*' ${top_srcdir}/VERSION`
 
--- autoopts/Makefile.am.orig
+++ autoopts/Makefile.am
@@ -133,7 +133,7 @@ INST_SH                   = autoopts-con
 
 man_MANS                  = $(INST_MANS)
 m4data_DATA               = autoopts.m4
-nobase_data_DATA          = $(INST_PKGCFG)
+pkgconfig_DATA          = $(INST_PKGCFG)
 lib_LTLIBRARIES           = $(INST_LIBS)
 nobase_include_HEADERS    = $(INST_HDRS)
 bin_SCRIPTS               = $(INST_SH)