From: Stefan Knoblich <stkn@openisdn.net>
Date: Fri, 4 Nov 2011 13:22:28 +0000 (+0100)
Subject: [6/6] srtp: Rename AUTOMAKE_OPTS to AUTOMAKE_OPTIONS
X-Git-Tag: v1.2-rc1~27^2~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=992eafd049c481ec9699dc481a24bdb9dd4bc27f;p=thirdparty%2Ffreeswitch.git

[6/6] srtp: Rename AUTOMAKE_OPTS to AUTOMAKE_OPTIONS

The latter is a well known automake variable, used
to set (per-Makefile) automake options and supported
since the beginning of time (= automake 1.4).

The former is a made-up variable that doesn't really
do anything.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
---

diff --git a/libs/srtp/Makefile.am b/libs/srtp/Makefile.am
index 4015ef977e..a238b660ee 100644
--- a/libs/srtp/Makefile.am
+++ b/libs/srtp/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTS= gnu
+AUTOMAKE_OPTIONS = gnu
 NAME=srtp
 
 AM_CFLAGS    = $(new_AM_CFLAGS) -I./src -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include
diff --git a/libs/srtp/test/Makefile.am b/libs/srtp/test/Makefile.am
index 05624ba7e9..2651f2714f 100644
--- a/libs/srtp/test/Makefile.am
+++ b/libs/srtp/test/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTS= gnu
+AUTOMAKE_OPTIONS = gnu
 AM_CFLAGS    = $(new_AM_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/crypto/include
 AM_CPPFLAGS  = $(AM_CFLAGS)
 AM_LDFLAGS   = $(new_AM_LDFLAGS) -L$(srcdir) -lsrtp