build: Call AC_CONFIG_HEADERS rather than AM_CONFIG_HEADER.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 639da81fbc05c51aa3f6d56bbe53a165e64cb9b1..6f8878a3e09c5b8b30f4f42f4a43825000b3c7a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
-AC_CONFIG_HEADER([config.h])
+AC_INIT([paraslash],[git],[maan@tuebingen.mpg.de])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
@@ -143,7 +143,7 @@ if test "$have_osl" = "yes"; then
 else
        AC_MSG_WARN([libosl not found, can not build para_server.
 Download libosl at
-       http://systemlinux.org/~maan/osl
+       http://people.tuebingen.mpg.de/maan/osl/
 or execute
        git clone git://git.tuebingen.mpg.de/osl
        ])
@@ -380,11 +380,17 @@ if test -n "$with_ogg_libs"; then
 fi
 AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
 AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 
 have_vorbis="yes"
 have_speex="yes"
 have_opus="yes"
 if test "$have_ogg" = "yes"; then
+       OLD_CPPFLAGS="$CPPFLAGS"
+       OLD_LDFLAGS="$LDFLAGS"
+       OLD_LIBS="$LIBS"
        # vorbis
        if test -n "$with_vorbis_headers"; then
                vorbis_cppflags="-I$with_vorbis_headers"
@@ -396,8 +402,14 @@ if test "$have_ogg" = "yes"; then
        fi
        AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
        AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
+       CPPFLAGS="$OLD_CPPFLAGS"
+       LDFLAGS="$OLD_LDFLAGS"
+       LIBS="$OLD_LIBS"
 
        # speex
+       OLD_CPPFLAGS="$CPPFLAGS"
+       OLD_LDFLAGS="$LDFLAGS"
+       OLD_LIBS="$LIBS"
        if test -n "$with_speex_headers"; then
                speex_cppflags="-I$with_speex_headers"
                CPPFLAGS="$CPPFLAGS $speex_cppflags"
@@ -408,8 +420,14 @@ if test "$have_ogg" = "yes"; then
        fi
        AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
        AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+       CPPFLAGS="$OLD_CPPFLAGS"
+       LDFLAGS="$OLD_LDFLAGS"
+       LIBS="$OLD_LIBS"
 
        # opus
+       OLD_CPPFLAGS="$CPPFLAGS"
+       OLD_LDFLAGS="$LDFLAGS"
+       OLD_LIBS="$LIBS"
        if test -n "$with_opus_headers"; then
                opus_cppflags="-I$with_opus_headers"
                CPPFLAGS="$CPPFLAGS $opus_cppflags"
@@ -420,6 +438,9 @@ if test "$have_ogg" = "yes"; then
        fi
        AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
        AC_CHECK_HEADERS([opus/opus.h], [], [ have_opus="no" ])
+       CPPFLAGS="$OLD_CPPFLAGS"
+       LDFLAGS="$OLD_LDFLAGS"
+       LIBS="$OLD_LIBS"
 else
        AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
        have_vorbis="no"
@@ -440,6 +461,7 @@ if test "$have_vorbis" = "yes" || \
 fi
 if test "$have_vorbis" = "yes"; then
        AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
+       AC_SUBST(vorbis_cppflags)
        vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
        AC_SUBST(vorbis_ldflags)
 fi
@@ -460,9 +482,6 @@ if test "$have_opus" = "yes"; then
 else
        AC_MSG_WARN([no ogg/opus $msg])
 fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
 ########################################################################### faad
 have_faad=yes
 OLD_CPPFLAGS="$CPPFLAGS"