Add finer-grained configure options for ogg/vorbis/speex.
[paraslash.git] / configure.ac
index a7bd3e1ab5e96bb956b8598af2786aadca2f106c..1b2dc11446ef04de20e0ed24125b41c2c9b22097 100644 (file)
@@ -31,12 +31,12 @@ AC_REPLACE_FNMATCH
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
+AC_HEADER_STDBOOL
 AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h \
        stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h \
        sys/ipc.h unistd.h utime.h stddef.h],
        [], [AC_MSG_ERROR([$ac_header not found])])
 
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -45,6 +45,7 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
+AC_TYPE_INT8_T
 AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T
@@ -75,7 +76,7 @@ AC_FUNC_LSTAT
 AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
        regcomp select strchr strdup strerror strstr strtol uname \
        fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
-       strncasecmp strrchr strspn alarm mkdir rmdir], [],
+       strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
        [AC_MSG_ERROR([function not found, cannot live without it])])
 
 cmdline_dir="cmdline"
@@ -94,7 +95,7 @@ server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
 wma_common wmadec_filter buffer_tree
 "
 
-executables="server recv filter audioc write client afh audiod"
+executables="recv filter audioc write client afh audiod"
 
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
@@ -132,7 +133,7 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal
        ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
        blob playlist sha1 sched acl send_common udp_send color fec
        server_command_list afs_command_list wma_afh wma_common"
-server_ldflags="-losl"
+server_ldflags=""
 server_audio_formats="mp3 wma"
 
 write_cmdline_objs="add_cmdline(write file_write)"
@@ -257,14 +258,18 @@ fi
 AC_CHECK_HEADER(osl.h, [], have_osl=no)
 AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
 if test "$have_osl" = "no"; then
-       AC_MSG_ERROR([libosl not found, download it at
+       AC_MSG_WARN([libosl not found, can not build para_server.
+Download libosl at
        http://systemlinux.org/~maan/osl
 or execute
        git clone git://git.tuebingen.mpg.de/osl
        ])
+else
+       extras="$extras server"
+       executables="$executables server"
+       AC_SUBST(osl_cppflags)
+       server_ldflags="$server_ldflags $osl_libs -losl"
 fi
-AC_SUBST(osl_cppflags)
-server_ldflags="$server_ldflags -L$with_osl_libs"
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -425,86 +430,120 @@ if test ${have_core_audio} = yes; then
 fi
 ########################################################### ogg/vorbis/speex
 have_ogg="yes"
-have_vorbis="yes"
-have_speex="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(oggvorbis_headers, [AC_HELP_STRING(--with-oggvorbis-headers=dir,
-       [look for ogg/vorbis/speex headers also in dir])])
-if test -n "$with_oggvorbis_headers"; then
-       ogg_cppflags="-I$with_oggvorbis_headers"
+AC_ARG_WITH(ogg_headers, [AC_HELP_STRING(--with-ogg-headers=dir,
+       [look for ogg headers also in dir])])
+AC_ARG_WITH(ogg_libs, [AC_HELP_STRING(--with-ogg-libs=dir,
+       [look for ogg libs also in dir])])
+AC_ARG_WITH(vorbis_headers, [AC_HELP_STRING(--with-vorbis-headers=dir,
+       [look for vorbis headers also in dir])])
+AC_ARG_WITH(vorbis_libs, [AC_HELP_STRING(--with-vorbis-libs=dir,
+       [look for vorbis libs also in dir])])
+AC_ARG_WITH(speex_headers, [AC_HELP_STRING(--with-speex-headers=dir,
+       [look for speex headers also in dir])])
+AC_ARG_WITH(speex_libs, [AC_HELP_STRING(--with-speex-libs=dir,
+       [look for speex libs also in dir])])
+
+if test -n "$with_ogg_headers"; then
+       ogg_cppflags="-I$with_ogg_headers"
        CPPFLAGS="$CPPFLAGS $ogg_cppflags"
 fi
-AC_ARG_WITH(oggvorbis_libs, [AC_HELP_STRING(--with-oggvorbis-libs=dir,
-       [look for ogg/vorbis/speex libs also in dir])])
-if test -n "$with_oggvorbis_libs"; then
-       ogg_libs="-L$with_oggvorbis_libs"
+if test -n "$with_ogg_libs"; then
+       ogg_libs="-L$with_ogg_libs"
        LDFLAGS="$LDFLAGS $ogg_libs"
 fi
-
-AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
-AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
-AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
 AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
-AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
-AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
+
+have_vorbis="yes"
+have_speex="yes"
+if test "$have_ogg" = "yes"; then
+       # vorbis
+       if test -n "$with_vorbis_headers"; then
+               vorbis_cppflags="-I$with_vorbis_headers"
+               CPPFLAGS="$CPPFLAGS $vorbis_cppflags"
+       fi
+       if test -n "$with_vorbis_libs"; then
+               vorbis_libs="-L$with_vorbis_libs"
+               LDFLAGS="$LDFLAGS $vorbis_libs"
+       fi
+       AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
+       AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
+
+       # speex
+       if test -n "$with_speex_headers"; then
+               speex_cppflags="-I$with_speex_headers"
+               CPPFLAGS="$CPPFLAGS $speex_cppflags"
+       fi
+       if test -n "$with_speex_libs"; then
+               speex_libs="-L$with_speex_libs"
+               LDFLAGS="$LDFLAGS $speex_libs"
+       fi
+       AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
+       AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+else
+       have_vorbis="no"
+       have_speex="no"
+fi
+
 msg="support in para_server/para_filter/para_afh"
-if test "$have_ogg" = "yes" && { test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; }; then
+if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
        AC_SUBST(ogg_cppflags)
        ogg_libs="$ogg_libs -logg"
        if test "$OSTYPE" = "Darwin"; then
-               ogg_libs="-Wl,-bind_at_load $ogg_libs $ogg_libs"
+               ogg_libs="-Wl,-bind_at_load $ogg_libs"
        fi
        server_ldflags="$server_ldflags $ogg_libs"
        filter_ldflags="$filter_ldflags $ogg_libs"
        audiod_ldflags="$audiod_ldflags $ogg_libs"
-       all_errlist_objs="$all_errlist_objs ogg_afh_common"
        afh_ldflags="$afh_ldflags $ogg_libs"
+       all_errlist_objs="$all_errlist_objs ogg_afh_common"
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"
-       if test "$have_vorbis" = "yes"; then
-               all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
-               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"
-               afh_ldflags="$afh_ldflags $vorbis_libs"
-
-               server_errlist_objs="$server_errlist_objs ogg_afh"
-               filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-               audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
-               afh_errlist_objs="$afh_errlist_objs ogg_afh"
-
-               audiod_audio_formats="$audiod_audio_formats ogg"
-               server_audio_formats="$server_audio_formats ogg"
-       else
-               AC_MSG_WARN([no ogg/vorbis $msg])
-       fi
-       if test "$have_speex" = "yes"; then
-               all_errlist_objs="$all_errlist_objs spxdec_filter spx_afh spx_common"
-               AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
-               filters="$filters spxdec"
-               speex_libs="-lspeex"
-               server_ldflags="$server_ldflags $speex_libs"
-               filter_ldflags="$filter_ldflags $speex_libs"
-               audiod_ldflags="$audiod_ldflags $speex_libs"
-               afh_ldflags="$afh_ldflags $speex_libs"
-
-               server_errlist_objs="$server_errlist_objs spx_afh spx_common"
-               filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
-               audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
-               afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
-
-               audiod_audio_formats="$audiod_audio_formats spx"
-               server_audio_formats="$server_audio_formats spx"
-       else
-               AC_MSG_WARN([no ogg/speex $msg])
-       fi
 else
-       AC_MSG_WARN([no ogg/vorbis ogg/speex $msg])
+       AC_MSG_WARN([vorbis/speex require ogg])
+fi
+if test "$have_vorbis" = "yes"; then
+       all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
+       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"
+       afh_ldflags="$afh_ldflags $vorbis_libs"
+
+       server_errlist_objs="$server_errlist_objs ogg_afh"
+       filter_errlist_objs="$filter_errlist_objs oggdec_filter"
+       audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
+       afh_errlist_objs="$afh_errlist_objs ogg_afh"
+
+       audiod_audio_formats="$audiod_audio_formats ogg"
+       server_audio_formats="$server_audio_formats ogg"
+else
+       AC_MSG_WARN([no ogg/vorbis $msg])
+fi
+if test "$have_speex" = "yes"; then
+       all_errlist_objs="$all_errlist_objs spxdec_filter spx_afh spx_common"
+       AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
+       filters="$filters spxdec"
+       speex_libs="-lspeex"
+       server_ldflags="$server_ldflags $speex_libs"
+       filter_ldflags="$filter_ldflags $speex_libs"
+       audiod_ldflags="$audiod_ldflags $speex_libs"
+       afh_ldflags="$afh_ldflags $speex_libs"
+
+       server_errlist_objs="$server_errlist_objs spx_afh spx_common"
+       filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+       audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
+       afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+
+       audiod_audio_formats="$audiod_audio_formats spx"
+       server_audio_formats="$server_audio_formats spx"
+else
+       AC_MSG_WARN([no ogg/speex $msg])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -731,7 +770,6 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
        [formats supported by para_server and para_afh])
 
-
 AC_SUBST(executables, add_para($executables))
 
 recv_objs="$recv_cmdline_objs $recv_errlist_objs"