* ./configure.in: added --enable-intfwin to enable the win32 interface and
    --with-bcbuilder to tell make where to find Borland C++ Builder.

ChangeLog

@@ -4,6 +4,8 @@
 
 HEAD
 
+  * ./configure.in: added --enable-intfwin to enable the win32 interface and
+    --with-bcbuilder to tell make where to find Borland C++ Builder.
   * ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place.
   * ./plugins/win32/Makefile: intfwin.so can be built using commandline.
   * ./configure.in, ./include/threads.h, ./include/common.h: a custom defs.h

Makefile.opts.in

@@ -48,8 +48,9 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 SHELL = @SHELL@
 RANLIB = @RANLIB@
-WINDRES = @WINDRES@
 MOC = @MOC@
+WINDRES = @WINDRES@
+BCBUILDER = @BCBUILDER@
 DLL_PATH = @DLL_PATH@
 
 # 

configure.in

@@ -1208,14 +1208,20 @@ AC_ARG_ENABLE(qnx,
     fi
 
 dnl
-dnl  Windows MFC interface module
+dnl  Windows native interface module, built with Borland C++ Builder
 dnl
-AC_ARG_ENABLE(win32,
-  [  --enable-win32          Win32 interface support (default disabled)],
-  [ if test "x$enableval" != "xno"
+AC_ARG_ENABLE(intfwin,
+[  --enable-intfwin        Win32 interface support (default disabled)],
+[ if test "x$enableval" != "xno"
+  then
+    AC_ARG_WITH(bcbuilder, 
+    [    --with-bcbuilder=PATH Borland C++ Builder installation path])
+    if test "x$with_bcbuilder" != "x"
     then
-      PLUGINS="${PLUGINS} win32"
-    fi ])
+      BCBUILDER="$with_bcbuilder"
+    fi
+    PLUGINS="${PLUGINS} intfwin"
+  fi ])
 
 dnl
 dnl  ncurses module
@@ -1419,6 +1425,7 @@ AC_SUBST(TUNING)
 AC_SUBST(RELEASE)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
+AC_SUBST(BCBUILDER)
 AC_SUBST(DLL_PATH)
 AC_SUBST(VLC_PACKAGE)
 AC_SUBST(VLC_VERSION)

include/defs.h.in

@@ -308,10 +308,10 @@
 #undef HAVE_LIBST
 
 /* Package name */
-#undef PACKAGE
+#undef VLC_PACKAGE
 
 /* Package version */
-#undef VERSION
+#undef VLC_VERSION
 
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV

plugins/win32/Makefile

@@ -8,7 +8,6 @@ waveout_SOURCES = waveout.c
 # we override everything by setting intfwin_CUSTOM
 #
 intfwin_CUSTOM = yes
-BCBUILDER = "D:/Program Files/CBuilder5"
 
 ../intfwin.so: Makefile
 	rm -f intfwin.mak