dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.29 2003/07/14 16:10:20 gbazin Exp $
+dnl $Id: configure.ac,v 1.33 2003/07/17 14:54:26 sam Exp $
AC_INIT(vlc,0.6.0)
if test "${FREETYPE_CONFIG}" != "no"
then
- AX_ADD_PLUGINS([osdtext])
- AX_ADD_CFLAGS([osdtext],[`${FREETYPE_CONFIG} --cflags`])
- AX_ADD_LDFLAGS([osdtext],[`${FREETYPE_CONFIG} --libs`])
+ AX_ADD_PLUGINS([freetype])
+ AX_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
elif test "${enable_freetype}" = "yes"
then
if test "${enable_mozilla}" = "yes"
then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
- if test "${MOZILLA_CONFIG}" != "no"
+ if test "${MOZILLA_CONFIG}" = "no"
then
+ AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+ else
if test "${SYS}" != "mingw32"; then
LDFLAGS="${LDFLAGS_save} -L${x_libraries}"
AC_CHECK_LIB(Xt,XtStrings,[
dnl
dnl Handle substvars that use $(top_srcdir)
dnl
-VLC_CONFIG="\$(top_builddir)/vlc-config"
+VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
AC_SUBST(VLC_CONFIG)
CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
ipkg/Makefile
lib/Makefile
modules/Makefile
+ mozilla/Makefile
m4/Makefile
po/Makefile.in
share/Makefile