Commit 80dbcde2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- Clean up build system

- Bump version number
- Fix --enable-slp
parent a5c8b934
......@@ -18,5 +18,5 @@ endif
man1_MANS=sapserver.1
dist_sysconf_DATA=sap.cfg
EXTRA_DIST = $(man1_MANS) bootstrap config.rpath m4/getopt.m4
EXTRA_DIST = $(man1_MANS) m4/getopt.m4 admin/config.rpath
-- Changes from version 0.3.0 to version 0.3.1
* Automatic selection of IP version protocol
* Fix sending of IPv6 addresses in announces
* Fix SLP configure option
* Fix compilation of SLP support
-- Changes from version 0.2.4 to version 0.3.0
* Interface selection (patch by John Wehle <john at feith dot com>)
......
......@@ -9,7 +9,7 @@ echo "+ Remove stuff"
set -x
rm -f config.h config.h.in
rm -f config.log configure config.guess config.sub
rm -f config.log configure
rm -f aclocal.m4
set +x
......@@ -33,7 +33,7 @@ echo "+ Generate Makefile.in and configure"
set -x
aclocal
aclocal -I m4
autoconf
autoheader
automake -a -c
dnl Autoconf settings for mini-SAP-server
dnl $Id$
AC_INIT(miniSAPserver,0.3.0,streaming@videolan.org)
AM_INIT_AUTOMAKE([check-news dist-bzip2 std-options])
AC_COPYRIGHT([Copyright (C) the VideoLAN team 1998-2005])
dnl ****************************
dnl Default settings
dnl ****************************
AC_INIT(miniSAPserver,0.3.1,streaming@videolan.org)
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_AUX_DIR(admin)
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADERS(config.h)
AM_CONFIG_HEADER(config.h)
AM_CONDITIONAL(CONFIG_SLP,false)
CXXFLAGS="-Wall"
dnl ****************************
dnl General checks
dnl ****************************
AC_PROG_CC
AC_PROG_CPP dnl C++
AC_PROG_CXX
AC_PROG_MAKE_SET dnl make result
AC_C_CONST
AC_HEADER_STDC
AC_HEADER_STDBOOL
AC_FUNC_MALLOC
AC_CHECK_FUNCS([clearenv])
RDC_REPLACE_FUNC_GETOPT_LONG
......@@ -32,21 +29,24 @@ dnl ****************************
dnl Features
dnl ****************************
AM_INIT_AUTOMAKE([check-news dist-bzip2 std-options])
dnl On the fly charset transcoding
AM_ICONV
dnl Enable/Disable slp
AS_IF([test "x${enable_slp}" == "x"],
[enable_slp="no"])
AC_ARG_ENABLE(slp,
AC_HELP_STRING([--enable-slp],
[enable SLP announcing (default disabled)]),
[if test ${enable_slp} = "yes"
then
AC_CHECK_HEADERS(slp.h, ,
echo "Unable to find SLP headers";exit 1)
AM_CONDITIONAL(CONFIG_SLP,true)
AC_DEFINE(CONFIG_SLP,,[SLP announcing support])
fi
[AC_HELP_STRING([--enable-slp],
[enable SLP announcing (default disabled)])],
[AS_IF([test "${enable_slp}" != "no"],
[AC_CHECK_HEADERS(slp.h,,
[AC_MSG_ERROR(["Unable to find SLP headers"])])
AC_DEFINE(CONFIG_SLP,,[SLP announcing support])
])
])
AM_CONDITIONAL(CONFIG_SLP, [test "${enable_slp}" != "no"])
dnl Debug Mode
AC_ARG_ENABLE(debug,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment