From 7d4458ada9275d56abd5b0c4d2f4f276891f8908 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 11 Feb 2005 10:00:15 +0000 Subject: [PATCH] fix for #147782 - get POPT flags in gtk-doc build Original commit message from CVS: fix for #147782 - get POPT flags in gtk-doc build --- ChangeLog | 7 +++++++ configure.ac | 1 + docs/gst/Makefile.am | 4 ++-- docs/libs/Makefile.am | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f18c1911b..7f795621b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-02-11 Thomas Vander Stichele + + * configure.ac: + * docs/gst/Makefile.am: + * docs/libs/Makefile.am: + make sure popt is added to gtk-doc flags. Fixes #147782. + 2005-02-09 Tim-Philipp Müller * docs/faq/using.xml: diff --git a/configure.ac b/configure.ac index 18bc93c0ea..cfc0b94814 100644 --- a/configure.ac +++ b/configure.ac @@ -308,6 +308,7 @@ int main () download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/]) ]) +AC_SUBST(POPT_CFLAGS) AC_SUBST(POPT_LIBS) dnl Check for ucontext.h diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index 56e94ccf2f..5fea76bbc6 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -107,8 +107,8 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir) -GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS) +GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) $(POPT_CFLAGS) -I$(top_builddir) +GTKDOC_LIBS = $(GST_OBJ_LIBS) $(POPT_LIBS) $(SCANOBJ_DEPS) GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index ee0e4e3f05..4ce067927a 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -80,8 +80,8 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir) -GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS) +GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) $(POPT_CFLAGS) -I$(top_builddir) +GTKDOC_LIBS = $(GST_OBJ_LIBS) $(POPT_LIBS) $(SCANOBJ_DEPS) GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)