r3864 - branches/beast-mingw

[stw svn gnome org]

Author: stw
Date: 2006-08-24 12:40:32 -0400 (Thu, 24 Aug 2006)
New Revision: 3864

Modified:
   branches/beast-mingw/ChangeLog.win32
   branches/beast-mingw/WIN32env.sh
   branches/beast-mingw/WIN32porting
   branches/beast-mingw/configure.in
Log:
Thu Aug 24 18:38:14 2006  Stefan Westerfeld  <stefan space twc de>

	* configure.in: The old configure.in generates the following line

	{ (exit 1); exit 1; }; } }
	
	which is a syntax error with the bash version 2.04.0(1) that the msys
	environment provides. I think this might be an automake bug, but I'm
	working around the issue now.

	* configure.in: Use pkg-config to detect ogg/vorbis, which will make
	ogg/vorbis support work even if it is installed in an unusual
	location.
	Likewise, fixed the guile-config check so that it still works if guile
	is installed in an unusual location, by ensuring that the output of
	guile-config --cflags is taken into account when searching for
	headers.

	* WIN32env.sh: Updated load path for guile-1.8.

	* WIN32porting: Mention libgmp-4.2.1, required for guile-1.8.0.


Modified: branches/beast-mingw/ChangeLog.win32
===================================================================
--- branches/beast-mingw/ChangeLog.win32	2006-08-24 11:13:04 UTC (rev 3863)
+++ branches/beast-mingw/ChangeLog.win32	2006-08-24 16:40:32 UTC (rev 3864)
@@ -1,3 +1,25 @@
+Thu Aug 24 18:38:14 2006  Stefan Westerfeld  <stefan space twc de>
+
+	* configure.in: The old configure.in generates the following line
+
+	{ (exit 1); exit 1; }; } }
+	
+	which is a syntax error with the bash version 2.04.0(1) that the msys
+	environment provides. I think this might be an automake bug, but I'm
+	working around the issue now.
+
+	* configure.in: Use pkg-config to detect ogg/vorbis, which will make
+	ogg/vorbis support work even if it is installed in an unusual
+	location.
+	Likewise, fixed the guile-config check so that it still works if guile
+	is installed in an unusual location, by ensuring that the output of
+	guile-config --cflags is taken into account when searching for
+	headers.
+
+	* WIN32env.sh: Updated load path for guile-1.8.
+
+	* WIN32porting: Mention libgmp-4.2.1, required for guile-1.8.0.
+
 Thu Aug 24 13:08:41 2006  Stefan Westerfeld  <stefan space twc de>
 
 	* WIN32todo: Added file with windows specific todo items, that were

Modified: branches/beast-mingw/WIN32env.sh
===================================================================
--- branches/beast-mingw/WIN32env.sh	2006-08-24 11:13:04 UTC (rev 3863)
+++ branches/beast-mingw/WIN32env.sh	2006-08-24 16:40:32 UTC (rev 3864)
@@ -8,4 +8,4 @@
 export LIBZ_CFLAGS="-I$HOME/prog/win32/win32-dev/include"
 export CC='gcc -mms-bitfields'
 export CXX='g++ -mms-bitfields'
-export GUILE_LOAD_PATH="$HOME/prog/win32/win32-dev/share/guile/1.6" 
+export GUILE_LOAD_PATH="$HOME/prog/win32/win32-dev/share/guile/1.8" 

Modified: branches/beast-mingw/WIN32porting
===================================================================
--- branches/beast-mingw/WIN32porting	2006-08-24 11:13:04 UTC (rev 3863)
+++ branches/beast-mingw/WIN32porting	2006-08-24 16:40:32 UTC (rev 3864)
@@ -35,3 +35,8 @@
 	#for dir in $(SUBDIRS); do make -C $$dir all; done
 and so on
 
+....
+
+to compile libgmp-4.2.1:
+
+./configure --prefix=/home/Stefan/prog/win32/win32-dev --enable-shared --disable-static ABI=32

Modified: branches/beast-mingw/configure.in
===================================================================
--- branches/beast-mingw/configure.in	2006-08-24 11:13:04 UTC (rev 3863)
+++ branches/beast-mingw/configure.in	2006-08-24 16:40:32 UTC (rev 3864)
@@ -216,20 +216,12 @@
     AC_DEFINE_UNQUOTED(BSE_VERSION, "$BSE_VERSION", [BSE Version])
 
     dnl # --- Ogg/Vorbis check ---
-    OV_LIBS=
-    ov_tests=0
-    AC_CHECK_LIB(vorbisfile, ogg_stream_reset_serialno,
-	[AC_CHECK_HEADER(ogg/ogg.h, ov_tests=`expr $ov_tests + 1`)]
-	[AC_CHECK_HEADER(vorbis/vorbisfile.h, ov_tests=`expr $ov_tests + 1`)]
-	[AC_CHECK_HEADER(vorbis/vorbisenc.h, ov_tests=`expr $ov_tests + 1`)]
-	,
-	ov_tests=0, -lvorbisenc -lvorbis -logg)
-    if test $ov_tests = 3 ; then
-	OV_LIBS="-lvorbisfile -lvorbisenc -lvorbis -logg"
-    else
-	AC_MSG_WARN([failed to detect Ogg/Vorbis library (>=1.0) or headers])
-    fi
-    
+    PKG_CHECK_MODULES(LIBOGG, ogg >= 1.0.0)
+    PKG_CHECK_MODULES(LIBVORBIS, vorbis >= 1.0.0)
+    PKG_CHECK_MODULES(LIBVORBISFILE, vorbisfile >= 1.0.0)
+    PKG_CHECK_MODULES(LIBVORBISENC, vorbisenc >= 1.0.0)
+    OV_LIBS="$LIBVORBISENC_LIBS $LIBVORBISFILE_LIBS $LIBVORBIS_LIBS $LIBOGG_LIBS"
+
     dnl # --- libmad MPEG decoder check ---
     dnl # libmad doesn't come with a mad.pc file (just its debian package)
     dnl # PKG_CHECK_MODULES(MAD, mad >= 0.14.2,
@@ -360,8 +352,14 @@
 	GUILE_LDFLAGS=`$GUILE_CONFIG link`
 	MC_CHECK_VERSION($GUILE_VERSION, $REQUIRED_VERSION, [guile_tests=`expr $guile_tests + 1`])
 	dnl # check headers seperately, since some distributions ship on-devel guile packages with guile-config
+	bse_save_CFLAGS="$CFLAGS"
+	bse_save_CPPFLAGS="$CPPFLAGS"
+	CFLAGS="$CFLAGS $GUILE_CFLAGS"
+	CPPFLAGS="$CPPFLAGS $GUILE_CFLAGS"
 	AC_CHECK_HEADER(guile/gh.h, guile_tests=`expr $guile_tests + 1`)
 	AC_CHECK_HEADER(libguile/properties.h, guile_tests=`expr $guile_tests + 1`) dnl # guile-1.6 headerfile
+	CPPFLAGS="$bse_save_CPPFLAGS"
+	CFLAGS="$bse_save_CFLAGS"
     fi
     if test $guile_tests = 4 ; then
 	BSESCM_CFLAGS="$GUILE_CFLAGS $BSESCM_CFLAGS"
@@ -532,7 +530,9 @@
     if test -z "$PYTHON" || $PYTHON -c "import sys; sys.exit (sys.hexversion >= 0x20401f0)" 2>/dev/null ; then
 	AC_MSG_ERROR([failed to detect python (version >= 2.4.1) required for maintainer mode])
     fi
-    test -z "$XMLLINT" && { AC_MSG_ERROR([failed to detect xmllint required for maintainer mode]) }
+    if test -z "$XMLLINT"; then
+	AC_MSG_ERROR([failed to detect xmllint required for maintainer mode])
+    fi
 else
     AC_MSG_RESULT(no)
 fi