diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 8 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 76490f7f..791b1980 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + lib_LTLIBRARIES = libopus.la INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed @@ -22,10 +22,14 @@ echo "checking for autoconf... " VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]*\).*/\1/" VERSIONMKINT="sed -e s/[^0-9]//" - + # do we need automake? if test -r Makefile.am; then - AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP` + AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am` + AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP` + if test "$AM_NEEDED" = "$AM_OPTIONS"; then + AM_NEEDED="" + fi if test -z $AM_NEEDED; then echo -n "checking for automake... " AUTOMAKE=automake diff --git a/configure.ac b/configure.ac index 747623db..5a307788 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,7 @@ AM_MAINTAINER_MODE AC_CANONICAL_HOST AM_PROG_LIBTOOL +AM_PROG_CC_C_O AC_PROG_CC_C99 AC_C_BIGENDIAN |