MINIZIP_LIBS="-lminizip -lz"
], [
have_minizip=no
- MINIZIP_CFLAGS="-I../../../@top_srcdir@//libs/unzip"
- MINIZIP_LIBS="../../../libs/unzip/libunzip.la"
+ MINIZIP_CFLAGS="-I\\\${top_srcdir}/libs/unzip"
+ MINIZIP_LIBS="\\\${top_builddir}/libs/unzip/libunzip.la"
])
])
VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
fi
fi
-AC_CACHE_CHECK([if \$CC accepts -O3],
- [ac_cv_c_o3],
- [CFLAGS="${CFLAGS_save} -O3"
- AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
-if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then
- CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3"
+AC_CACHE_CHECK([if \$CC accepts -O4],
+ [ac_cv_c_o4],
+ [CFLAGS="${CFLAGS_save} -O4"
+ AC_TRY_COMPILE([],,ac_cv_c_o4=yes, ac_cv_c_o4=no)])
+if test "${ac_cv_c_o4}" != "no" -a "x${enable_debug}" = "xno"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O4"
else
- AC_CACHE_CHECK([if \$CC accepts -O2],
- [ac_cv_c_o2],
- [CFLAGS="${CFLAGS_save} -O2"
- AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
- if test "${ac_cv_c_o2}" != "no"; then
- CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2"
+ AC_CACHE_CHECK([if \$CC accepts -O3],
+ [ac_cv_c_o3],
+ [CFLAGS="${CFLAGS_save} -O3"
+ AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
+ if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3"
else
- AC_CACHE_CHECK([if \$CC accepts -O],
- [ac_cv_c_o],
- [CFLAGS="${CFLAGS_save} -O"
- AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
- if test "${ac_cv_c_o}" != "no"; then
- CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O"
+ AC_CACHE_CHECK([if \$CC accepts -O2],
+ [ac_cv_c_o2],
+ [CFLAGS="${CFLAGS_save} -O2"
+ AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
+ if test "${ac_cv_c_o2}" != "no"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2"
+ else
+ AC_CACHE_CHECK([if \$CC accepts -O],
+ [ac_cv_c_o],
+ [CFLAGS="${CFLAGS_save} -O"
+ AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+ if test "${ac_cv_c_o}" != "no"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O"
+ fi
fi
fi
fi
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo])
- VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader])
- VLC_ADD_LIBS([dmo],[../../../libs/loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader])
- VLC_ADD_LIBS([quicktime],[../../libs/loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER])
- VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la])
- VLC_ADD_CPPFLAGS([realvideo],[-I../../@top_srcdir@/libs/loader -DLOADER])
- VLC_ADD_LIBS([realvideo],[../../libs/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([dmo],[-I\\\${top_srcdir}/libs/loader])
+ VLC_ADD_LIBS([dmo],[\\\${top_builddir}/libs/loader/libloader.la -lpthread])
+ VLC_ADD_CPPFLAGS([quicktime],[-I\\\${top_srcdir}/libs/loader])
+ VLC_ADD_LIBS([quicktime],[\\\${top_builddir}/libs/loader/libloader.la -lpthread])
+ VLC_ADD_CPPFLAGS([realaudio],[-I\\\${top_srcdir}/libs/loader -DLOADER])
+ VLC_ADD_LIBS([realaudio],[\\\${top_builddir}/libs/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([realvideo],[-I\\\${top_srcdir}/libs/loader -DLOADER])
+ VLC_ADD_LIBS([realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
])
AC_ARG_WITH(,[Components:])
plugin_support=no
])
-AS_IF([test "${enable_shared}" = "no"], [
- plugin_support=no
-])
-
AS_IF([test "${plugin_support}" != "no"], [
- AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
+ AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, [Define if dynamic plugins are supported])
])
-AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
-
-dnl Temporary(?) hack for plugins/builtins transition
-dnl VLC_ADD_PLUGIN([${BUILTINS}])
-dnl BUILTINS=""
dnl
dnl Pic and shared libvlc stuff
dnl
dnl Handle substvars that use $(top_srcdir)
dnl
-VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
+VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
AC_SUBST(VLC_CONFIG)
CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}"