diff --git a/configure b/configure
index ff8d42f63..99dad9251 100755
--- a/configure
+++ b/configure
@@ -6593,7 +6593,7 @@ fi
       LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
 
       LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
-      LIBVORBIS_LOCAL_CONFIGURE_OPTS="--with-ogg=../libogg --with-ogg-libraries=.. --disable-oggtest"
+      export PKG_CONFIG_PATH="${srcdir}/lib-src/libogg:${PKG_CONFIG_PATH}"
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are available in this source tree" >&5
 $as_echo "$as_me: Vorbis libraries are available in this source tree" >&6;}
diff --git a/m4/audacity_checklib_libvorbis.m4 b/m4/audacity_checklib_libvorbis.m4
index b0446cac4..34ba6391a 100644
--- a/m4/audacity_checklib_libvorbis.m4
+++ b/m4/audacity_checklib_libvorbis.m4
@@ -60,7 +60,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
       LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
 
       LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis"
-      LIBVORBIS_LOCAL_CONFIGURE_OPTS="--with-ogg=../libogg --with-ogg-libraries=.. --disable-oggtest"
+      export PKG_CONFIG_PATH="${srcdir}/lib-src/libogg:${PKG_CONFIG_PATH}"
 
       AC_MSG_NOTICE([Vorbis libraries are available in this source tree])
    else