build: cppflags/ldflags conversion: libspeex.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0dbc6b3b0c6524aef886cbccda4d02e19b535460..b12dc1815ca5c3245c8cebe80a018c23cf54930e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -618,16 +618,11 @@ if test "$have_vorbis" = "yes" || \
                test "$have_speex" = "yes" || \
                test "$have_opus" = "yes"; then
        AC_SUBST(ogg_cppflags)
-       ogg_libs="$ogg_libs -logg"
+       ogg_ldflags="$ogg_libs -logg"
        if test "$OSTYPE" = "Darwin"; then
-               ogg_libs="-Wl,-bind_at_load $ogg_libs"
+               ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
        fi
-       server_ldflags="$server_ldflags $ogg_libs"
-       filter_ldflags="$filter_ldflags $ogg_libs"
-       audiod_ldflags="$audiod_ldflags $ogg_libs"
-       play_ldflags="$play_ldflags $ogg_libs"
-       afh_ldflags="$afh_ldflags $ogg_libs"
-       recv_ldflags="$recv_ldflags $ogg_libs"
+       AC_SUBST(ogg_ldflags)
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"
@@ -636,13 +631,8 @@ fi
 if test "$have_vorbis" = "yes"; then
        AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
        filters="$filters oggdec"
-       vorbis_libs="-lvorbis -lvorbisfile"
-       server_ldflags="$server_ldflags $vorbis_libs"
-       filter_ldflags="$filter_ldflags $vorbis_libs"
-       audiod_ldflags="$audiod_ldflags $vorbis_libs"
-       play_ldflags="$play_ldflags $vorbis_libs"
-       afh_ldflags="$afh_ldflags $vorbis_libs"
-       recv_ldflags="$recv_ldflags $vorbis_libs"
+       vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
+       AC_SUBST(vorbis_ldflags)
 
        server_errlist_objs="$server_errlist_objs ogg_afh"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
@@ -653,19 +643,14 @@ if test "$have_vorbis" = "yes"; then
 
        audiod_audio_formats="$audiod_audio_formats ogg"
        audio_format_handlers="$audio_format_handlers ogg"
-else
-       AC_MSG_WARN([no ogg/vorbis $msg])
 fi
 if test "$have_speex" = "yes"; then
        AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
+       AC_SUBST(speex_cppflags)
+       speex_ldflags="$speex_libs -lspeex"
+       AC_SUBST(speex_ldflags)
+
        filters="$filters spxdec"
-       speex_libs="-lspeex"
-       server_ldflags="$server_ldflags $speex_libs"
-       filter_ldflags="$filter_ldflags $speex_libs"
-       audiod_ldflags="$audiod_ldflags $speex_libs"
-       play_ldflags="$play_ldflags $speex_libs"
-       afh_ldflags="$afh_ldflags $speex_libs"
-       recv_ldflags="$recv_ldflags $speex_libs"
 
        server_errlist_objs="$server_errlist_objs spx_afh spx_common"
        filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
@@ -823,14 +808,8 @@ AC_MSG_RESULT($have_libid3tag)
 
 if test ${have_libid3tag} = yes; then
        AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag)
-       server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz"
-       afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz"
-       play_ldflags="$play_ldflags -lz"
-       recv_ldflags="$recv_ldflags $id3tag_libs -lid3tag"
-       play_ldflags="$play_ldflags $id3tag_libs -lid3tag"
        AC_SUBST(id3tag_cppflags)
-else
-       AC_MSG_WARN([no support for id3v2 tags])
+       AC_SUBST(id3tag_ldflags, "$id3tag_libs -lid3tag -lz")
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -1332,8 +1311,6 @@ else
        AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 ############################################################# error2.h
-AC_MSG_NOTICE(creating error2.h)
-
 # these are always built
 all_errlist_objs="
        $recv_errlist_objs
@@ -1363,10 +1340,14 @@ fi
 
 all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
 
+object_executable_matrix=
 for i in $executables; do
-       echo "$i: "
-       eval echo \$${i}_errlist_objs
-done | ./error2.pl > error2.h
+       eval objs=\$${i}_errlist_objs
+       object_executable_matrix="$object_executable_matrix $i: $objs"
+done
+# use echo to replace newlines by space
+AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix))
+
 for obj in $all_errlist_objs; do
        SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
 done
@@ -1374,7 +1355,6 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
        [enum {$SS NUM_SS}],
        [list of all objects that use the paraslash error facility]
 )
-
 ################################################################## status items
 
 status_items="basename status num_played mtime bitrate frequency file_size
@@ -1497,7 +1477,7 @@ unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
 audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
-filters: $filters
+filters: $(echo $filters)
 writers: $writers
 
 $mixer_summary