Cleanup configure.in
This commit is contained in:
parent
36a0217199
commit
88acac711b
31
configure.in
31
configure.in
|
@ -9,8 +9,6 @@ AC_USE_SYSTEM_EXTENSIONS
|
|||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
dnl AC_PROG_YACC
|
||||
dnl AM_PROG_LEX
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
AC_CHECK_HEADERS([sys/wait.h])
|
||||
|
@ -42,14 +40,6 @@ use_ffmpeg=true;
|
|||
use_upnp=false;
|
||||
use_iconv=true
|
||||
|
||||
STATIC_LIBS=no
|
||||
|
||||
CPPFLAGS="${CPPFLAGS} -g -Wall"
|
||||
|
||||
dnl fix freebsd's broken (?) libpthread
|
||||
AC_CHECK_LIB(c_r,pthread_creat,LIBS="${LIBS} -lc_r", [
|
||||
AC_CHECK_LIB(pthread,pthread_create,LIBS="${LIBS} -lpthread") ])
|
||||
|
||||
AC_ARG_ENABLE(iconv, AC_HELP_STRING([--enable-iconv], [Enable iconv conversion]),
|
||||
[ case "${enableval}" in
|
||||
yes) use_iconv=true;;
|
||||
|
@ -85,14 +75,8 @@ AM_CONDITIONAL(COND_MUSEPACK, test x$use_musepack = xtrue)
|
|||
AM_CONDITIONAL(COND_FFMPEG,test x$use_ffmpeg = xtrue)
|
||||
AM_CONDITIONAL(COND_UPNP,test x$use_upnp = xtrue)
|
||||
|
||||
#AM_CONDITIONAL(COND_NEED_STRCASESTR,false)
|
||||
#AM_CONDITIONAL(COND_NEED_STRSEP,false)
|
||||
AC_CHECK_FUNCS(strcasestr strsep)
|
||||
|
||||
dnl Darwin's stupid cpp preprocessor....
|
||||
echo Host type is $host
|
||||
CPPFLAGS="$CPPFLAGS -DHOST='\"$host\"'"
|
||||
|
||||
dnl Checks for libraries.
|
||||
PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.24 ])
|
||||
PKG_CHECK_MODULES(SQLITE3, [ sqlite3 ],
|
||||
|
@ -115,14 +99,6 @@ if test x$use_ffmpeg = xtrue; then
|
|||
PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat ])
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(static-libs,
|
||||
[--with-static-libs[[=DIR]] use static libs in DIR],[
|
||||
if test "$withval" != "no" -a "$withval" != "yes"; then
|
||||
Z_DIR=$withval
|
||||
STATIC_LIBS="$withval"
|
||||
fi
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h,,)
|
||||
AC_CHECK_HEADERS(stdint.h,,)
|
||||
|
||||
|
@ -144,20 +120,19 @@ AC_PROG_GCC_TRADITIONAL
|
|||
AC_TYPE_SIGNAL
|
||||
AC_CHECK_FUNCS(select socket strdup strerror)
|
||||
|
||||
dnl check to see if we need -lsocket (solaris)
|
||||
|
||||
AC_CHECK_LIB(dl,dlsym)
|
||||
|
||||
dnl check to see if we need -lsocket (solaris)
|
||||
V_NETLIBS=""
|
||||
AC_CHECK_LIB(socket,socket,V_NETLIBS="-lsocket $V_NETLIBS",,)
|
||||
|
||||
AC_SUBST(V_NETLIBS)
|
||||
|
||||
|
||||
if test x$use_iconv = xtrue; then
|
||||
dnl add the iconv stuff
|
||||
AM_ICONV
|
||||
LDFLAGS="${LDFLAGS} ${LIBICONV}"
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(HOST, "$host", [host triplet])
|
||||
|
||||
AC_OUTPUT(src/Makefile src/plugins/Makefile admin-root/Makefile admin-root/lib-js/Makefile admin-root/lib-js/script.aculo.us/Makefile contrib/Makefile contrib/init.d/Makefile Makefile)
|
||||
|
|
Loading…
Reference in New Issue