"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
minidlna-1.2.1.tar.gz and minidlna-1.3.0.tar.gz

About: ReadyMedia (formerly known as MiniDLNA) is a simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients.

configure.ac  (minidlna-1.2.1):configure.ac  (minidlna-1.3.0)
skipping to change at line 70 skipping to change at line 70
m4_ifdef([AC_TYPE_SSIZE_T], [AC_TYPE_SSIZE_T]) m4_ifdef([AC_TYPE_SSIZE_T], [AC_TYPE_SSIZE_T])
AC_STRUCT_DIRENT_D_TYPE AC_STRUCT_DIRENT_D_TYPE
AC_STRUCT_ST_BLOCKS AC_STRUCT_ST_BLOCKS
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
AC_C_BIGENDIAN AC_C_BIGENDIAN
# Checks for library functions. # Checks for library functions.
AC_FUNC_FORK AC_FUNC_FORK
AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
AC_CHECK_FUNCS([gethostname getifaddrs gettimeofday inet_ntoa memmove memset mkd ir realpath select sendfile setlocale socket strcasecmp strchr strdup strerror s trncasecmp strpbrk strrchr strstr strtol strtoul]) AC_CHECK_FUNCS([gethostname getifaddrs gettimeofday inet_ntoa memmove memset mkd ir realpath select sendfile setlocale socket strcasecmp strchr strdup strerror s trncasecmp strpbrk strrchr strstr strtol strtoul])
AC_CHECK_DECLS([SEEK_HOLE])
AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use
clock_gettime])],)
# #
# Check for struct ip_mreqn # Check for struct ip_mreqn
# #
AC_MSG_CHECKING(for struct ip_mreqn) AC_MSG_CHECKING(for struct ip_mreqn)
AC_TRY_COMPILE([#include <netinet/in.h>], [ AC_TRY_COMPILE([#include <netinet/in.h>], [
struct ip_mreqn mreq; struct ip_mreqn mreq;
mreq.imr_address.s_addr = 0; mreq.imr_address.s_addr = 0;
], [ ], [
# Yes, we have it... # Yes, we have it...
skipping to change at line 145 skipping to change at line 147
#error #error
#endif #endif
] ]
)], )],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_CLOCK_GETTIME_SYSCALL], [1], [Whether the __NR_clock_get time syscall is defined]) AC_DEFINE([HAVE_CLOCK_GETTIME_SYSCALL], [1], [Whether the __NR_clock_get time syscall is defined])
], ],
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [ 1], [use clock_gettime])],)
]) ])
AC_CHECK_HEADER(linux/netlink.h, AC_CHECK_HEADER(linux/netlink.h,
[AC_DEFINE([HAVE_NETLINK],[1],[Support for Linux netlink])], [], [#include < sys/socket.h>]) [AC_DEFINE([HAVE_NETLINK],[1],[Support for Linux netlink])], [], [#include < sys/socket.h>])
################################################################################ ################################ ################################################################################ ################################
### Library checks ### Library checks
CPPFLAGS_SAVE="$CPPFLAGS" CPPFLAGS_SAVE="$CPPFLAGS"
for dir in "" /usr/local $INCLUDE_DIR; do for dir in "" /usr/local $INCLUDE_DIR; do
skipping to change at line 412 skipping to change at line 413
break break
done done
test x"$ac_cv_lib_jpeg_jpeg_set_defaults" = x"yes" || AC_MSG_ERROR([Could not fi nd libexif]) test x"$ac_cv_lib_jpeg_jpeg_set_defaults" = x"yes" || AC_MSG_ERROR([Could not fi nd libexif])
AC_SUBST(LIBEXIF_LIBS) AC_SUBST(LIBEXIF_LIBS)
LDFLAGS_SAVE="$LDFLAGS" LDFLAGS_SAVE="$LDFLAGS"
for dir in "" /usr/local $SEARCH_DIR; do for dir in "" /usr/local $SEARCH_DIR; do
if test -n "$dir"; then if test -n "$dir"; then
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
fi fi
AC_CHECK_LIB([id3tag], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
break break
done done
test x"$ac_cv_lib_id3tag_id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could no t find libid3tag])
AC_SUBST(LIBID3TAG_LIBS) AC_SUBST(LIBID3TAG_LIBS)
LDFLAGS_SAVE="$LDFLAGS" LDFLAGS_SAVE="$LDFLAGS"
for dir in "" /usr/local $SEARCH_DIR; do for dir in "" /usr/local $SEARCH_DIR; do
if test -n "$dir"; then if test -n "$dir"; then
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
fi fi
AC_CHECK_LIB(sqlite3, sqlite3_open, [LIBSQLITE3_LIBS="-lsqlite3"], [unset ac _cv_lib_sqlite3_sqlite3_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) AC_CHECK_LIB(sqlite3, sqlite3_open, [LIBSQLITE3_LIBS="-lsqlite3"], [unset ac _cv_lib_sqlite3_sqlite3_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
AC_CHECK_LIB(sqlite3, sqlite3_malloc, [AC_DEFINE([HAVE_SQLITE3_MALLOC], [1], [Define to 1 if the sqlite3_malloc function exists.])]) AC_CHECK_LIB(sqlite3, sqlite3_malloc, [AC_DEFINE([HAVE_SQLITE3_MALLOC], [1], [Define to 1 if the sqlite3_malloc function exists.])])
AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [AC_DEFINE([HAVE_SQLITE3_PREPARE_V 2], [1], [Define to 1 if the sqlite3_prepare_v2 function exists.])]) AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [AC_DEFINE([HAVE_SQLITE3_PREPARE_V 2], [1], [Define to 1 if the sqlite3_prepare_v2 function exists.])])
break break
done done
test x"$ac_cv_lib_sqlite3_sqlite3_open" = x"yes" || AC_MSG_ERROR([Could not find libsqlite3]) test x"$ac_cv_lib_sqlite3_sqlite3_open" = x"yes" || AC_MSG_ERROR([Could not find libsqlite3])
AC_SUBST(LIBSQLITE3_LIBS) AC_SUBST(LIBSQLITE3_LIBS)
LDFLAGS_SAVE="$LDFLAGS" LDFLAGS_SAVE="$LDFLAGS"
for dir in "" /usr/local $SEARCH_DIR; do for dir in "" /usr/local $SEARCH_DIR; do
if test -n "$dir"; then if test -n "$dir"; then
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
fi fi
AC_CHECK_LIB([avformat], [av_open_input_file], [LIBAVFORMAT_LIBS="-lavformat AC_CHECK_LIB([avformat -lavcodec -lavutil -lz], [avformat_open_input], [LIBA
"], VFORMAT_LIBS="-lavformat -lavcodec -lavutil -lz"],
[AC_CHECK_LIB([avformat], [avformat_open_input], [LIBAVFORMAT_LI [AC_CHECK_LIB([avformat -lavcodec -lavutil -lz], [av_open_input_
BS="-lavformat"], file], [LIBAVFORMAT_LIBS="-lavformat -lavcodec -lavutil -lz"],
[unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_a vformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])]) [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_a vformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])])
break break
done done
if test x"$ac_cv_lib_avformat_av_open_input_file" != x"yes" && if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"
test x"$ac_cv_lib_avformat_avformat_open_input" != x"yes"; then yes" &&
test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x
"yes"; then
AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) AC_MSG_ERROR([Could not find libavformat - part of ffmpeg])
fi fi
AC_SUBST(LIBAVFORMAT_LIBS) AC_SUBST(LIBAVFORMAT_LIBS)
AC_CHECK_LIB(avutil ,[av_rescale_q], [LIBAVUTIL_LIBS="-lavutil"], [AC_MSG_ERROR(
[Could not find libavutil - part of ffmpeg])])
AC_SUBST(LIBAVUTIL_LIBS)
AC_CHECK_LIB(pthread, pthread_create) AC_CHECK_LIB(pthread, pthread_create)
# test if we have vorbisfile # test if we have vorbisfile
# prior versions had ov_open_callbacks in libvorbis, test that, too. # prior versions had ov_open_callbacks in libvorbis, test that, too.
AC_CHECK_LIB(vorbisfile, ov_open_callbacks, AC_CHECK_LIB(vorbisfile, ov_open_callbacks,
[AC_CHECK_HEADERS([vorbis/vorbisfile.h], [AC_CHECK_HEADERS([vorbis/vorbisfile.h],
AM_CONDITIONAL(HAVE_VORBISFILE, true) AM_CONDITIONAL(HAVE_VORBISFILE, true)
AC_DEFINE(HAVE_VORBISFILE,1,[Have vorbisfile]), AC_DEFINE(HAVE_VORBISFILE,1,[Have vorbisfile]),
AM_CONDITIONAL(HAVE_VORBISFILE, false))], AM_CONDITIONAL(HAVE_VORBISFILE, false))],
AM_CONDITIONAL(HAVE_VORBISFILE, false), AM_CONDITIONAL(HAVE_VORBISFILE, false),
skipping to change at line 490 skipping to change at line 488
[AC_CHECK_HEADERS([avahi-common/thread-watch.h], [AC_CHECK_HEADERS([avahi-common/thread-watch.h],
AM_CONDITIONAL(HAVE_AVAHI, true) AM_CONDITIONAL(HAVE_AVAHI, true)
AC_DEFINE(HAVE_AVAHI,1,[Have avahi]), AC_DEFINE(HAVE_AVAHI,1,[Have avahi]),
AM_CONDITIONAL(HAVE_AVAHI, false))], AM_CONDITIONAL(HAVE_AVAHI, false))],
AM_CONDITIONAL(HAVE_AVAHI, false), AM_CONDITIONAL(HAVE_AVAHI, false),
-lavahi-client -lavahi-common) -lavahi-client -lavahi-common)
################################################################################ ################################ ################################################################################ ################################
### Header checks ### Header checks
AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h lib AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h lib
intl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h sys/i intl.h locale.h netdb.h netinet/in.h poll.h stddef.h stdlib.h string.h sys/file.
notify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h]) h sys/inotify.h sys/ioctl.h sys/param.h sys/queue.h sys/socket.h sys/time.h unis
td.h])
test x"$ac_cv_header_poll_h" != x"yes" && AC_MSG_ERROR([poll.h not found or not
usable])
test x"$ac_cv_header_sys_queue_h" != x"yes" && AC_MSG_ERROR([sys/queue.h not fou
nd or not usable])
AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotif y support]), [ AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotif y support]), [
AC_MSG_CHECKING([for __NR_inotify_init syscall]) AC_MSG_CHECKING([for __NR_inotify_init syscall])
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[ [
#include <asm/unistd.h> #include <asm/unistd.h>
], ],
[ [
#ifndef __NR_inotify_init #ifndef __NR_inotify_init
skipping to change at line 514 skipping to change at line 514
)], )],
[ [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotify support]) AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotify support])
], ],
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
]) ])
AC_CHECK_FUNCS(kqueue, AM_CONDITIONAL(HAVE_KQUEUE, true), AM_CONDITIONAL(HAVE_KQ
UEUE, false))
################################################################################ ################################ ################################################################################ ################################
### Build Options ### Build Options
AC_ARG_WITH(log-path, AC_ARG_WITH(log-path,
AS_HELP_STRING([--with-log-path=PATH],[Default log path]), AS_HELP_STRING([--with-log-path=PATH],[Default log path]),
[with_logpath="$withval"],[with_logpath="/var/log"]) [with_logpath="$withval"],[with_logpath="/var/log"])
AC_DEFINE_UNQUOTED([DEFAULT_LOG_PATH],"${with_logpath}",[Log path]) AC_DEFINE_UNQUOTED([DEFAULT_LOG_PATH],"${with_logpath}",[Log path])
AC_ARG_WITH(db-path, AC_ARG_WITH(db-path,
AS_HELP_STRING([--with-db-path=PATH],[Default DB path]), AS_HELP_STRING([--with-db-path=PATH],[Default DB path]),
skipping to change at line 604 skipping to change at line 606
fi fi
],[ ],[
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
] ]
) )
AC_MSG_CHECKING([whether to build a static binary executable]) AC_MSG_CHECKING([whether to build a static binary executable])
AC_ARG_ENABLE(static, AC_ARG_ENABLE(static,
[ --enable-static build a static binary executable],[ [ --enable-static build a static binary executable],[
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
STATIC_CFLAGS="-DSTATIC" CFLAGS="$CFLAGS -DSTATIC"
AC_SUBST(STATIC_CFLAGS) LDFLAGS="$LDFLAGS -static"
STATIC_LDFLAGS="-Wl,-Bstatic" AC_MSG_RESULT([yes])
AC_SUBST(STATIC_LDFLAGS) else
AC_MSG_RESULT([no])
fi
],[
AC_MSG_RESULT([no])
]
)
AC_MSG_CHECKING([whether to enable LTO])
AC_ARG_ENABLE(lto,
[ --enable-lto enable link-time optimization],[
if test "$enableval" = "yes"; then
CFLAGS="$CFLAGS -flto"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
],[ ],[
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
] ]
) )
case "$target_os" in case "$target_os" in
 End of changes. 10 change blocks. 
20 lines changed or deleted 40 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)