* configure.ac vlc-config.in.in: Oops, vlc-config needs top_builddir, not

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index d5bdc1d2ecfdb48a85e048cdd95194a267bdd0dc..b53f3f8cb0779858fbc93c06ea681d34fd4ffb5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.30 2003/07/14 21:32:58 sigmunau Exp $
+dnl $Id: configure.ac,v 1.33 2003/07/17 14:54:26 sam Exp $
 
 AC_INIT(vlc,0.6.0)
 
@@ -3035,8 +3035,10 @@ AC_ARG_ENABLE(mozilla,
 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,[
@@ -3191,7 +3193,7 @@ AC_SUBST(PLUGIN_PATH)
 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"
 
@@ -3237,6 +3239,7 @@ AC_OUTPUT([
   ipkg/Makefile
   lib/Makefile
   modules/Makefile
+  mozilla/Makefile
   m4/Makefile
   po/Makefile.in
   share/Makefile