X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=6bbedb0361c0ba86fdfd399a817e06fb0a1a9cad;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=3c2955bf764036e207262f2c5e853cde41769e54;hpb=ec532b44ab55ca6db21780a3f90ed2d6c37eab90;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 3c2955bf..6bbedb03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,7 +510,10 @@ AM_PATH_PYTHON([3.0], [
 
     AS_IF([test -z "$PYTHON_LDFLAGS"], [
       AC_MSG_CHECKING([Python library flags])
-      PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+      # Python 3.8+ requires that we pass --embed to get the -lpython3.x flag.
+      AS_IF([! PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags --embed`], [
+        PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+      ])
       AC_MSG_RESULT([$PYTHON_LDFLAGS])
     ])
   ])
@@ -560,7 +563,7 @@ AS_IF([test "x$enable_api_doc" = "xyes"],
     DX_XML_FEATURE(OFF)
     DX_PDF_FEATURE(OFF)
     DX_PS_FEATURE(OFF)
-    DX_INIT_DOXYGEN([Babeltrace], [$(srcdir)/Doxyfile], [output])
+    DX_INIT_DOXYGEN([Babeltrace 2], [$(builddir)/Doxyfile], [output])
     AS_IF([test -z "$DX_DOXYGEN"],
 	  [AC_MSG_ERROR([You need doxygen to enable the API documentation])]
     )
@@ -721,8 +724,9 @@ program_transform_name="s&babeltrace2\.bin&babeltrace2&;$program_transform_name"
 AC_SUBST(program_transform_name)
 
 AC_CONFIG_FILES([
-	doc/api/Doxyfile
 	doc/api/Makefile
+	doc/api/libbabeltrace2/Doxyfile
+	doc/api/libbabeltrace2/Makefile
 	doc/bindings/Makefile
 	doc/bindings/python/Makefile
 	doc/contributing-images/Makefile
@@ -783,7 +787,6 @@ AC_CONFIG_FILES([
 	src/string-format/Makefile
 	tests/bitfield/Makefile
 	tests/ctf-writer/Makefile
-	tests/argpar/Makefile
 	tests/lib/Makefile
 	tests/lib/test-plugin-plugins/Makefile
 	tests/Makefile