X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=953a9d213e5402055d1c22407daae60a292675e0;hp=98d75c78501e3d22ed934c5395c0c65c96dcd178;hb=92d85d340495154f3fda23f322af13fc9de42155;hpb=f6db57bc964bc78f1a7ce521dee2108289cd8b8e

diff --git a/configure.ac b/configure.ac
index 98d75c78..953a9d21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_DEFUN([UNSTASH_FLAGS], [
 	LIBS="$OLD_LIBS"
 ])
 AC_DEFUN([LIB_SUBST_FLAGS], [
-	if test "$HAVE_[]m4_toupper([$1])" == 'yes'; then
+	if test "$HAVE_[]m4_toupper([$1])" = 'yes'; then
 		AC_DEFINE(HAVE_[]m4_toupper([$1]), 1,
 			define to 1 to turn on $1 support)
 	else
@@ -65,32 +65,23 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 	AC_SUBST($1_ldflags)
 ])
 
-AC_PATH_PROG(UNAMEPATH, uname, no)
-if test "$UNAMEPATH" = "no"; then
-	AC_MSG_ERROR(unable to determine system type)
-fi
-AC_MSG_CHECKING(os type)
-OSTYPE="`$UNAMEPATH -s`"
-AC_MSG_RESULT("$OSTYPE")
-
-if test "$OSTYPE" = "SunOS"; then
-	# needed on SunOS for socket magic
-	arch_cppflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
-	AC_SUBST(arch_cppflags)
-fi
-
+AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([gengetopt], [gengetopt])
-test -z "$gengetopt" && AC_MSG_ERROR(
+AC_PATH_PROG([GENGETOPT], [gengetopt])
+test -z "$GENGETOPT" && AC_MSG_ERROR(
 	[gengetopt is required to build this package])
 
-AC_PATH_PROG([help2man], [help2man])
-test -z "$help2man" && AC_MSG_ERROR(
+AC_PATH_PROG([M4], [m4])
+test -z "$M4" && AC_MSG_ERROR(
+	[The m4 macro processor is required to build this package])
+
+AC_PATH_PROG([HELP2MAN], [help2man])
+test -z "$HELP2MAN" && AC_MSG_ERROR(
 	[help2man is required to build this package])
 
-AC_PATH_PROG([install], [install])
-test -z "$install" && AC_MSG_ERROR(
+AC_PATH_PROG([INSTALL], [install])
+test -z "$INSTALL" && AC_MSG_ERROR(
 	[The install program is required to build this package])
 
 AC_PROG_CC
@@ -174,6 +165,30 @@ AC_CHECK_LIB([c], [socket],
 	[socket_ldflags="-lsocket"]
 )
 AC_SUBST(socket_ldflags)
+########################################################################## iconv
+STASH_FLAGS
+LIBS=
+AC_SEARCH_LIBS([libiconv_open], [iconv],
+	[iconv_ldflags="$LIBS"],
+	[]
+)
+AC_SUBST(iconv_ldflags)
+AC_MSG_CHECKING([whether iconv needs const char ** cast])
+AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([
+                #include <iconv.h>
+        ],[
+                size_t iconv(iconv_t cd, const char **inbuf,
+                        size_t *inbytesleft, char **outbuf,
+                        size_t *outbytesleft);
+        ])
+],
+        [cast='(const char **)'; msg=yes],
+        [cast=; msg=no]
+)
+AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()])
+AC_MSG_RESULT($msg)
+UNSTASH_FLAGS
 ########################################################################### libnsl
 AC_CHECK_LIB([c], [gethostbyname],
 	[nsl_ldflags=],
@@ -183,7 +198,6 @@ AC_SUBST(nsl_ldflags)
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-	#define _GNU_SOURCE
 	#include <sys/types.h>
 	#include <sys/socket.h>
 ]], [[
@@ -194,7 +208,7 @@ if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
 ########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $gengetopt --file-name conftest-ggo &&
+echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
 AC_CHECK_DECL(
 	[gengetopt_args_info_description],
 	[ggo_descriptions_declared=yes],
@@ -203,39 +217,14 @@ AC_CHECK_DECL(
 )
 AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
-have_curses="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
-	[look for curses.h also in dir])])
-if test -n "$with_curses_headers"; then
-	curses_cppflags="-I$with_curses_headers"
-	CPPFLAGS="$CPPFLAGS $curses_cppflags"
-fi
-AC_ARG_WITH(curses_libs, [AS_HELP_STRING(--with-curses-libs=dir,
-	[look for libcurses also in dir])])
-if test -n "$with_curses_libs"; then
-	curses_libs="-L$with_curses_libs"
-	LDFLAGS="$LDFLAGS $curses_libs"
-fi
-AC_CHECK_HEADER(curses.h, [], [
-	have_curses="no"
-])
-curses_ldflags="$curses_libs"
-AC_CHECK_LIB([ncursesw], [initscr],
-	[curses_ldflags="$curses_libs -lncursesw"], [
-		AC_CHECK_LIB([curses], [initscr],
-			[curses_ldflags="$curses_libs -lcurses"],
-			[have_curses="no"]
-		)
-	]
-)
-AC_SUBST(curses_cppflags)
-AC_SUBST(curses_ldflags)
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([curses], [])
+HAVE_CURSES=yes
+AC_CHECK_HEADER(curses.h, [], [HAVE_CURSES=no])
+AC_SEARCH_LIBS([initscr], [ncursesw curses], [], [HAVE_CURSES=no])
+curses_ldflags="$curses_ldflags $LIBS"
+LIB_SUBST_FLAGS(curses)
+UNSTASH_FLAGS
 ########################################################################### ip_mreqn
 AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast))
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -273,6 +262,8 @@ 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])
+AC_CHECK_LIB([ogg], [ogg_stream_flush_fill], [
+	AC_DEFINE(HAVE_OGG_STREAM_FLUSH_FILL, 1, [libogg >= 1.3.0])])
 LIB_SUBST_FLAGS(ogg)
 UNSTASH_FLAGS
 ######################################################################### vorbis
@@ -385,76 +376,24 @@ AC_CHECK_LIB([ao], [ao_initialize], [], HAVE_AO=no)
 LIB_SUBST_FLAGS(ao)
 UNSTASH_FLAGS
 AC_DEFUN([NEED_AO_OBJECTS], [{ test $HAVE_AO = yes -a $HAVE_PTHREAD = yes; }])
-############################################################# readline
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_readline="yes"
-AC_ARG_WITH(readline_headers, [AS_HELP_STRING(--with-readline-headers=dir,
-	[look for libreadline header files also in dir])])
-if test -n "$with_readline_headers"; then
-	readline_cppflags="-I$with_readline_headers"
-	CPPFLAGS="$CPPFLAGS $readline_cppflags"
-fi
-
-AC_ARG_WITH(readline_libs, [AS_HELP_STRING(--with-readline-libs=dir,
-	[look for readline library also in dir])])
-if test -n "$with_readline_libs"; then
-	readline_libs="-L$with_readline_libs"
-	LDFLAGS="$LDFLAGS $readline_libs"
-fi
-msg="no interactive cli support"
-AC_CHECK_HEADERS([readline/readline.h], [
-	], [
-	have_readline="no"
-	AC_MSG_WARN([readline/readline.h not found, $msg])
-])
-
-if test "$have_readline" = "yes"; then
-	readline_ldflags="$readline_libs"
-	AC_SEARCH_LIBS([rl_free_keymap], [readline], [
-		readline_ldflags="$readline_ldflags -lreadline"
-	], [have_readline="no"])
-	if test "$have_readline" = "no"; then # try with -lcurses
-                # clear cache
-		AC_MSG_NOTICE([trying again with -lcurses])
-                unset ac_cv_search_rl_free_keymap 2> /dev/null
-		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
-			have_readline=yes
-			readline_ldflags="$readline_ldflags -lreadline -lcurses"
-		], [], [-lcurses])
-	fi
-	if test "$have_readline" = "no"; then # try with -ltermcap
-                # clear cache
-		AC_MSG_NOTICE([trying again with -ltermcap])
-                unset ac_cv_search_rl_free_keymap 2> /dev/null
-		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
-			have_readline=yes
-			readline_ldflags="$readline_ldflags -lreadline -ltermcap"
-		], [], [-ltermcap])
-	fi
-fi
-
-if test "$have_readline" = "yes"; then
-	AC_CHECK_DECL(
-		[rl_free_keymap],
-		[AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
-		[],
-		[
-			#include <stdio.h>
-			#include <readline/readline.h>
-		]
-	)
-	AC_SUBST(readline_cppflags)
-	AC_SUBST(readline_ldflags)
-	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
-else
-	AC_MSG_WARN([libreadline not found or unusable])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+######################################################################## readline
+STASH_FLAGS
+AC_SEARCH_LIBS([tgetent], [tinfo curses terminfo termcap])
+LIB_ARG_WITH([readline], [-lreadline $LIBS])
+HAVE_READLINE=yes
+AC_CHECK_HEADER([readline/readline.h], [], [HAVE_READLINE=no])
+AC_CHECK_LIB([readline], [rl_free_keymap], [], HAVE_READLINE=no)
+AC_CHECK_DECL(
+	[rl_free_keymap],
+	[AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
+	[],
+	[
+		#include <stdio.h>
+		#include <readline/readline.h>
+	]
+)
+LIB_SUBST_FLAGS(readline)
+UNSTASH_FLAGS
 ############################################################# libsamplerate
 STASH_FLAGS
 LIB_ARG_WITH([samplerate], [-lsamplerate])
@@ -463,6 +402,14 @@ AC_CHECK_HEADER(samplerate.h, [], HAVE_SAMPLERATE=no)
 AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no)
 LIB_SUBST_FLAGS(samplerate)
 UNSTASH_FLAGS
+########################################################################## mp4v2
+STASH_FLAGS
+LIB_ARG_WITH([mp4v2], [-lmp4v2])
+HAVE_MP4V2=yes
+AC_CHECK_HEADER([mp4v2/mp4v2.h], [], [HAVE_MP4V2=no])
+AC_CHECK_LIB([mp4v2], [MP4Read], [], [HAVE_MP4V2=no])
+LIB_SUBST_FLAGS(mp4v2)
+UNSTASH_FLAGS
 ######################################################################### server
 if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	build_server="yes"
@@ -517,7 +464,9 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	NEED_SPEEX_OBJECTS() && server_errlist_objs="$server_errlist_objs spx_afh spx_common"
 	NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common"
 	NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh"
-	test $HAVE_FAAD = yes && server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+	if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then
+		server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+	fi
 	server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
 	AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
@@ -551,7 +500,7 @@ if test -n "$CRYPTOLIB"; then
 	else
 		client_errlist_objs="$client_errlist_objs gcrypt"
 	fi
-	if test "$have_readline" = "yes"; then
+	if test $HAVE_READLINE = yes; then
 		client_errlist_objs="$client_errlist_objs interactive"
 	fi
 	client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
@@ -725,7 +674,7 @@ else
 	AC_MSG_WARN([no mixer support])
 fi
 ########################################################################### gui
-if test "$have_curses" = "yes"; then
+if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
 	gui_cmdline_objs="gui"
@@ -874,7 +823,7 @@ NEED_SPEEX_OBJECTS && recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
 NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 
-if test $HAVE_FAAD = yes; then
+if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
 	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 fi
 recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
@@ -914,8 +863,8 @@ NEED_FLAC_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs flac_afh"
 	audio_format_handlers="$audio_format_handlers flac"
 }
-if test $HAVE_FAAD = yes; then
-	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
+if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
+	afh_errlist_objs="$afh_errlist_objs aac_afh aac_common"
 	audio_format_handlers="$audio_format_handlers aac"
 fi
 
@@ -991,7 +940,13 @@ NEED_FLAC_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
 }
 if test $HAVE_FAAD = yes; then
-	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
+	play_errlist_objs="$play_errlist_objs aacdec_filter"
+fi
+if test $HAVE_MP4V2 = yes; then
+	play_errlist_objs="$play_errlist_objs aac_afh"
+fi
+if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
+	play_errlist_objs="$play_errlist_objs aac_common"
 fi
 if test $HAVE_MAD = yes; then
 	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
@@ -1009,7 +964,7 @@ NEED_AO_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs ao_write"
 	play_cmdline_objs="$play_cmdline_objs ao_write"
 }
-if test "$have_readline" = "yes"; then
+if test $HAVE_READLINE = yes; then
 	play_errlist_objs="$play_errlist_objs interactive"
 fi
 if test $HAVE_SAMPLERATE = yes; then
@@ -1092,7 +1047,7 @@ audioc_errlist_objs="
 	version
 	ggo
 "
-if test "$have_readline" = "yes"; then
+if test $HAVE_READLINE = yes; then
 	audioc_errlist_objs="$audioc_errlist_objs
 		buffer_tree
 		interactive
@@ -1183,13 +1138,15 @@ paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 crypto lib: ${CRYPTOLIB:-[none]}
 unix socket credentials: $have_ucred
-readline (interactive CLIs): $have_readline
-audio formats handlers: $audio_format_handlers
+readline (interactive CLIs): $HAVE_READLINE
 id3 version 2 support: $HAVE_ID3TAG
-filters: $filters
+faad: $HAVE_FAAD
+mp4v2: $HAVE_MP4V2
+
+audio format handlers: $audio_format_handlers
+filters: $(echo $filters)
 writers: $writers
 
-para_fade: $build_fade
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade