Build dance continues.

configure.in

@@ -57,7 +57,8 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_LIBTOOL_WIN32_DLL 
-AC_PROG_LIBTOOL
+LIBTOOL="libtool"
+AM_PROG_LIBTOOL
 AC_CHECK_PROG(we_have_sed, sed, yes, no)
 
 dnl ---------------------------------------------------------------------
@@ -234,9 +235,19 @@ AC_CHECK_FUNCS([memset strrchr])
 dnl Add Makefile conditionals
 AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
 AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes)
-AM_CONDITIONAL(BUILD_BEOS_CPP, test x$this_is_beos = xyes)
 AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes)
 
+if test x$this_is_beos = xyes; then
+  BUILD_BEOS_CPP=beos.cpp
+  BUILD_BEOS_EXTRA=
+else
+  BUILD_BEOS_CPP=
+  BUILD_BEOS_EXTRA=beos.cpp
+fi
+
+AC_SUBST([BUILD_BEOS_CPP])
+AC_SUBST([BUILD_BEOS_EXTRA])
+
 LDFLAGS="$LDFLAGS -no-undefined"
 
 AC_OUTPUT([

platform/Makefile.am

@@ -2,28 +2,15 @@ noinst_LTLIBRARIES = libplatform.la
 
 INCLUDES = -I$(top_srcdir)
 
-if BUILD_BEOS_CPP
-    BEOS_SRC = beos.cpp
-else
-    BEOS_SRC =
-endif
-
-if !BUILD_BEOS_CPP
-    BEOS_EXTRA = beos.cpp
-else
-    BEOS_EXTRA =
-endif
-
-
 libplatform_la_SOURCES =	\
 	unix.c                  \
 	posix.c                 \
-    $(BEOS_SRC)
+    @BUILD_BEOS_CPP@
 
 
 EXTRA_DIST =      \
 	skeleton.c    \
 	macclassic.c  \
 	win32.c       \
-    $(BEOS_EXTRA)
+    @BUILD_BEOS_EXTRA@