use git-tar-tree to make the tarball

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 698467893104a2362f43dd36121a8973faff5c1c..f0754926397ec97afe04ee3afc45ec14d745cfeb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -236,12 +236,19 @@ if test "$have_alsa" = "yes"; then
 fi
 ########################################################################### ortp
 have_ortp="yes"
 fi
 ########################################################################### ortp
 have_ortp="yes"

-AC_CHECK_HEADERS([ortp/ortp.h], [], [
-       have_ortp="no"
-])
-AC_CHECK_LIB([ortp], [ortp_init], [], [
-       have_ortp="no"
-])
+AC_ARG_ENABLE(ortp, AC_HELP_STRING([--disable-ortp], [Disable ortp support]),
+       if test x$enableval = xno; then
+               have_ortp=no
+       fi
+)
+if test "$have_ortp" = "yes"; then
+       AC_CHECK_HEADERS([ortp/ortp.h], [], [
+               have_ortp="no"
+       ])
+       AC_CHECK_LIB([ortp], [ortp_init], [], [
+               have_ortp="no"
+       ])
+fi

 if test "$have_ortp" = "yes"; then
        recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline"
        recv_errlist_objs="$recv_errlist_objs ortp_recv"
 if test "$have_ortp" = "yes"; then
        recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline"
        recv_errlist_objs="$recv_errlist_objs ortp_recv"


@@ -257,7 +264,7 @@ if test "$have_ortp" = "yes"; then
        AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else
        AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else

-       AC_MSG_WARN([deactivating ortp support])
+       AC_MSG_NOTICE([deactivating ortp support])

 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)


@@ -326,7 +333,7 @@ AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)

-names="$(for i in $write_writers; do printf '\"'$i'\", ' ; done)"
+names="$(for i in $write_writers; do printf \"$i\",' ' ; done)"

 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
 inits="$(for i in $write_writers; do printf 'extern void '$i'_writer_init(struct writer *); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
 inits="$(for i in $write_writers; do printf 'extern void '$i'_writer_init(struct writer *); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)