Skip to contentSkip to conversation

Add missing call to AM_PROG_CC_C_O.

PATCH New Diego Elio Pettenò 1 participant 3 messages Jan 20, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 Add missing call to AM_PROG_CC_C_O.

Resolves this warning when rebuilding autotools:

alsactl/Makefile.am:10: compiling alsactl.c' with per-target flags requires AM_PROG_CC_C_O' in `configure.in'

---
 configure.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
configure.in +1 -0
index 561ca46..6892fbf 100644
@@ -24,6 +24,7 @@ then
 fi
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 dnl AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_MKDIR_P
Signature · 1 line
1.7.4.rc2
#1 lore raw

PATCH 2/3 Pass -D_GNU_SOURCE together with INCLUDES (for the preprocessor).

This removes this warning when rebuilding autotools:

alsaloop/Makefile.am:3: `CFLAGS' is a user variable, you should not override it;
alsaloop/Makefile.am:3: use `AM_CFLAGS' instead.

---
 alsaloop/Makefile.am |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
alsaloop/Makefile.am +1 -2
index f76eafd..840448f 100644
@@ -1,6 +1,5 @@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -D_GNU_SOURCE
 LDADD = -lm
-CFLAGS += -D_GNU_SOURCE
 if HAVE_SAMPLERATE
 LDADD += -lsamplerate
 endif
Signature · 1 line
1.7.4.rc2
#2 lore raw

PATCH 3/3 Fix xmlto detection, allow building without xmlto installed.

In reply to Diego Elio Pettenò
---
 configure.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
configure.in +2 -4
index 6892fbf..51e7d63 100644
@@ -102,11 +102,9 @@ AC_ARG_ENABLE(alsaloop,
      esac],[alsaloop=true])
 AM_CONDITIONAL(ALSALOOP, test x$alsaloop = xtrue)
 
-xmlto=""
 AC_ARG_ENABLE(xmlto,
- AS_HELP_STRING([--disable-xmlto], [Disable man page creation via xmlto]),
- xmlto="$enableval", xmlto="yes")
-if test "$xmlto" = "yes"; then
+ AS_HELP_STRING([--disable-xmlto], [Disable man page creation via xmlto]))
+if test "x$enable_xmlto" != "xno"; then
   AC_CHECK_PROG([xmlto], [xmlto], [yes])
 fi
 AM_CONDITIONAL(USE_XMLTO, test x"$xmlto" = xyes)
Signature · 1 line
1.7.4.rc2