[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[5137] trunk/libspectrum

[<zu...@us...>]

Revision: 5137
          http://sourceforge.net/p/fuse-emulator/code/5137
Author:   zubzero
Date:     2015-03-15 15:50:28 +0000 (Sun, 15 Mar 2015)
Log Message:
-----------
Remove automatic fallback to GLib replacement (now --with-fake-glib)

Modified Paths:
--------------
    trunk/libspectrum/README
    trunk/libspectrum/configure.ac
    trunk/libspectrum/hacking/ChangeLog

Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README	2015-03-14 13:23:36 UTC (rev 5136)
+++ trunk/libspectrum/README	2015-03-15 15:50:28 UTC (rev 5137)
@@ -59,7 +59,7 @@
 
 ./configure --target=powerpc-gekko --host=powerpc-gekko \
 	    --prefix=$DEVKITPPC \
-	    --without-gcrypt --without-glib --without-libaudiofile
+	    --without-gcrypt --with-fake-glib --without-libaudiofile
 
 That is assuming you don't have gcrypt, glib and libaudiofile for the
 Wii. At the time of writing, those haven't been ported yet.

Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac	2015-03-14 13:23:36 UTC (rev 5136)
+++ trunk/libspectrum/configure.ac	2015-03-15 15:50:28 UTC (rev 5137)
@@ -158,23 +158,23 @@
   )
 fi
 
-dnl Either find glib or use the replacement
-AC_MSG_CHECKING(whether to use glib)
-AC_ARG_WITH(glib,
-[  --without-glib          don't use glib],
-if test "$withval" = no; then glib=no; else glib=yes; fi,
-glib=yes)
-AC_MSG_RESULT($glib)
-AS_IF([test "$glib" = yes], [
+dnl Either find GLib or use the replacement
+AC_MSG_CHECKING(whether to use internal GLib replacement)
+AC_ARG_WITH(fake-glib,
+[  --with-fake-glib        use internal GLib replacement],
+if test "$withval" = no; then myglib=no; else myglib=yes; fi,
+myglib=no)
+AC_MSG_RESULT($myglib)
+AS_IF([test "$myglib" = no], [
   PKG_CHECK_MODULES(
     GLIB,
     glib-2.0,
-    AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib]),
-    glib="no"
+    AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got GLib]),
+    AC_MSG_ERROR([GLib not found])
   )
 ])
 
-AM_CONDITIONAL(USE_MYGLIB, test "$glib" = no)
+AM_CONDITIONAL(USE_MYGLIB, test "$myglib" = yes)
 
 dnl If it appears we're using gcc as our compiler, turn on warnings
 if test "$ac_cv_c_compiler_gnu" = yes; then

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2015-03-14 13:23:36 UTC (rev 5136)
+++ trunk/libspectrum/hacking/ChangeLog	2015-03-15 15:50:28 UTC (rev 5137)
@@ -990,3 +990,5 @@
          for libspectrum_{new,renew}() macros (Stuart).
 20150302 libspectrum.h.in,memory.c: rename libspectrum_calloc() to
          libspectrum_malloc0_n() (Stuart).
+20150315 configure.ac: remove automatic fallback to GLib replacement (now
+         --with-fake-glib) (Stuart).

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.