build: convert vorbis detection to new macros.
[paraslash.git] / configure.ac
index 639da81fbc05c51aa3f6d56bbe53a165e64cb9b1..20b8b52cf767995e69eb3db88c8e1fb74902b31e 100644 (file)
@@ -3,8 +3,9 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
-AC_CONFIG_HEADER([config.h])
+AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
+       [maan@tuebingen.mpg.de], [], [http://people.tuebingen.mpg.de/maan/paraslash/])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
@@ -23,6 +24,46 @@ AC_DEFUN([objlist_to_errlist],[ \
        make_errlist_defines($@) \
        [const char **para_errlist[[]]] = {make_para_errlists($@)} \
 ])
+AC_DEFUN([LIB_ARG_WITH], [
+       AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir,
+               [look for $1 headers in dir])])
+       AC_ARG_WITH($1-libs, [AS_HELP_STRING(--with-$1-libs=dir,
+               [look for $1 libraries in dir])])
+       if test -n "$with_$1_headers"; then
+               $1_cppflags="-I$with_$1_headers"
+               CPPFLAGS="$CPPFLAGS $$1_cppflags"
+       fi
+       if test -n "$with_$1_libs"; then
+               $1_ldflags="-L$with_$1_libs $2"
+       else
+               $1_ldflags="$2"
+       fi
+       LDFLAGS="$LDFLAGS $$1_ldflags"
+])
+
+AC_DEFUN([STASH_FLAGS], [
+       OLD_CPPFLAGS="$CPPFLAGS"
+       OLD_LDFLAGS="$LDFLAGS"
+       OLD_LIBS="$LIBS"
+])
+
+AC_DEFUN([UNSTASH_FLAGS], [
+       CPPFLAGS="$OLD_CPPFLAGS"
+       LDFLAGS="$OLD_LDFLAGS"
+       LIBS="$OLD_LIBS"
+])
+AC_DEFUN([LIB_SUBST_FLAGS], [
+       if test "$HAVE_[]m4_toupper([$1])" == 'yes'; then
+               AC_DEFINE(HAVE_[]m4_toupper([$1]), 1,
+                       define to 1 to turn on $1 support)
+       else
+               $1_cppflags=
+               $1_ldflags=
+       fi
+       AC_SUBST(HAVE_[]m4_toupper([$1]))
+       AC_SUBST($1_cppflags)
+       AC_SUBST($1_ldflags)
+])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
 if test "$UNAMEPATH" = "no"; then
@@ -55,54 +96,6 @@ test -z "$install" && AC_MSG_ERROR(
 AC_PROG_CC
 AC_PROG_CPP
 
-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
-AC_TYPE_OFF_T
-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
-AC_TYPE_MODE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UID_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_MKTIME
-AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_FUNC_CLOSEDIR_VOID
-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 inet_ntoa socket], [],
-       [AC_MSG_ERROR([function not found, cannot live without it])])
-
 executables="recv filter audioc write afh play"
 ################################################################## clock_gettime
 clock_gettime_lib=
@@ -116,41 +109,15 @@ fi
 if test "$clock_gettime_lib" = "rt"; then
        AC_SUBST(clock_gettime_ldflags, -lrt)
 fi
-########################################################################### osl
-have_osl=yes
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
-       [look for osl.h also in dir])])
-if test -n "$with_osl_headers"; then
-       osl_cppflags="-I$with_osl_headers"
-       CPPFLAGS="$CPPFLAGS $osl_cppflags"
-fi
-AC_ARG_WITH(osl_libs, [AS_HELP_STRING(--with-osl-libs=dir,
-       [look for libosl also in dir])])
-if test -n "$with_osl_libs"; then
-       osl_libs="-L$with_osl_libs"
-       LDFLAGS="$LDFLAGS $osl_libs"
-fi
 
-AC_CHECK_HEADER(osl.h, [], have_osl=no)
-AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
-if test "$have_osl" = "yes"; then
-       AC_SUBST(osl_cppflags)
-       osl_ldflags="$osl_libs -losl"
-       AC_SUBST(osl_ldflags)
-else
-       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
-       ])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+########################################################################### osl
+STASH_FLAGS
+LIB_ARG_WITH([osl], [-losl])
+HAVE_OSL=yes
+AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no])
+AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no])
+LIB_SUBST_FLAGS(osl)
+UNSTASH_FLAGS
 ########################################################################### crypto
 AC_ARG_ENABLE(cryptolib, [AS_HELP_STRING(--enable-cryptolib=lib, [
        Force using crypto library "lib". This package requires either
@@ -348,19 +315,30 @@ if test ${have_core_audio} = yes; then
        AC_SUBST(core_audio_ldflags)
        AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
+########################################################################### ogg
+STASH_FLAGS
+LIB_ARG_WITH([ogg], [-logg])
+HAVE_OGG=yes
+AC_CHECK_HEADERS([ogg/ogg.h], [], [HAVE_OGG=no])
+AC_CHECK_LIB([ogg], [ogg_stream_init], [], [HAVE_OGG=no])
+LIB_SUBST_FLAGS(ogg)
+UNSTASH_FLAGS
+######################################################################### vorbis
+STASH_FLAGS
+LIB_ARG_WITH([vorbis], [-lvorbis -lvorbisfile])
+HAVE_VORBIS=yes
+AC_CHECK_HEADERS([vorbis/codec.h], [], [HAVE_VORBIS=no])
+AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [HAVE_VORBIS=no])
+LIB_SUBST_FLAGS(vorbis)
+UNSTASH_FLAGS
+
+AC_DEFUN([NEED_OGG_OBJECTS], [{
+       test "$HAVE_OGG" = 'yes' -a "$HAVE_VORBIS" = 'yes'
+}])
+AC_DEFUN([NEED_VORBIS_OBJECTS], [{
+       test "$HAVE_OGG" = 'yes' -a "$HAVE_VORBIS" = 'yes'
+}])
 ####################################################### ogg/vorbis/speex/opus
-have_ogg="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
-       [look for ogg headers also in dir])])
-AC_ARG_WITH(ogg_libs, [AS_HELP_STRING(--with-ogg-libs=dir,
-       [look for ogg libs also in dir])])
-AC_ARG_WITH(vorbis_headers, [AS_HELP_STRING(--with-vorbis-headers=dir,
-       [look for vorbis headers also in dir])])
-AC_ARG_WITH(vorbis_libs, [AS_HELP_STRING(--with-vorbis-libs=dir,
-       [look for vorbis libs also in dir])])
 AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir,
        [look for speex headers also in dir])])
 AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
@@ -370,34 +348,14 @@ AC_ARG_WITH(opus_headers, [AS_HELP_STRING(--with-opus-headers=dir,
 AC_ARG_WITH(opus_libs, [AS_HELP_STRING(--with-opus-libs=dir,
        [look for opus libs also in dir])])
 
-if test -n "$with_ogg_headers"; then
-       ogg_cppflags="-I$with_ogg_headers"
-       CPPFLAGS="$CPPFLAGS $ogg_cppflags"
-fi
-if test -n "$with_ogg_libs"; then
-       ogg_libs="-L$with_ogg_libs"
-       LDFLAGS="$LDFLAGS $ogg_libs"
-fi
-AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
-AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
-
-have_vorbis="yes"
 have_speex="yes"
 have_opus="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" ])
+if test "$HAVE_OGG" = 'yes'; then
 
        # 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 +366,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,29 +384,15 @@ 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"
        have_speex="no"
        have_opus="no"
 fi
 
-msg="support in para_server/para_filter/para_afh"
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
-       AC_SUBST(ogg_cppflags)
-       ogg_ldflags="$ogg_libs -logg"
-       if test "$OSTYPE" = "Darwin"; then
-               ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
-       fi
-       AC_SUBST(ogg_ldflags)
-fi
-if test "$have_vorbis" = "yes"; then
-       AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
-       vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
-       AC_SUBST(vorbis_ldflags)
-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)
@@ -460,9 +410,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"
@@ -809,7 +756,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ######################################################################### server
 if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
-       -a "$have_osl" = "yes" ; then
+       -a "$HAVE_OSL" = "yes" ; then
 
        build_server="yes"
        executables="$executables server"
@@ -859,14 +806,8 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
        if test "$have_gcrypt" = "yes"; then
                server_errlist_objs="$server_errlist_objs gcrypt"
        fi
-       if test "$have_vorbis" = "yes" || \
-                       test "$have_speex" = "yes" || \
-                       test "$have_opus" = "yes"; then
-               server_errlist_objs="$server_errlist_objs ogg_afh_common"
-       fi
-       if test "$have_vorbis" = "yes"; then
-               server_errlist_objs="$server_errlist_objs ogg_afh"
-       fi
+       NEED_OGG_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh_common"
+       NEED_VORBIS_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh"
        if test "$have_speex" = "yes"; then
                server_errlist_objs="$server_errlist_objs spx_afh spx_common"
        fi
@@ -988,10 +929,10 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
                audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
                audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
        fi
-       if test "$have_vorbis" = "yes"; then
+       NEED_VORBIS_OBJECTS && {
                audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
                audiod_audio_formats="$audiod_audio_formats ogg"
-       fi
+       }
        if test "$have_speex" = "yes"; then
                audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
                audiod_audio_formats="$audiod_audio_formats spx"
@@ -1156,11 +1097,10 @@ filter_cmdline_objs="
        prebuffer_filter
        sync_filter
 "
-
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
        filters="$filters oggdec"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-fi
+}
 if test "$have_speex" = "yes"; then
        filters="$filters spxdec"
        filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
@@ -1232,14 +1172,10 @@ recv_errlist_objs="
        mp3_afh
        version
 "
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
+if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || test "$have_opus" = 'yes'; then
        recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
 fi
-if test "$have_vorbis" = "yes"; then
-       recv_errlist_objs="$recv_errlist_objs ogg_afh"
-fi
+NEED_VORBIS_OBJECTS && recv_errlist_objs="$recv_errlist_objs ogg_afh"
 if test "$have_speex" = "yes"; then
        recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 fi
@@ -1272,15 +1208,13 @@ afh_errlist_objs="
        version
        ggo
 "
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
+if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || test "$have_opus" = 'yes'; then
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 fi
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
        afh_errlist_objs="$afh_errlist_objs ogg_afh"
        audio_format_handlers="$audio_format_handlers ogg"
-fi
+}
 if test "$have_speex" = "yes"; then
        afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
        audio_format_handlers="$audio_format_handlers spx"
@@ -1353,14 +1287,12 @@ if test "$have_core_audio" = "yes"; then
        play_errlist_objs="$play_errlist_objs osx_write ipc"
        play_cmdline_objs="$play_cmdline_objs osx_write"
 fi
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
+if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || test "$have_opus" = 'yes'; then
        play_errlist_objs="$play_errlist_objs ogg_afh_common"
 fi
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
        play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
-fi
+}
 if test "$have_speex" = "yes"; then
        play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
 fi
@@ -1522,9 +1454,8 @@ 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
+SS=$(for obj in $all_errlist_objs; do
+       printf '%s' " SS_$obj,"; done | tr 'a-z' 'A-Z')
 AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
        [enum {$SS NUM_SS}],
        [list of all objects that use the paraslash error facility]