# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1330797970 21600
# Node ID ac56489c2ca6a07bc28b147899f8e0c283506d44
# Parent  75e5bb1e0aa101e1a08d6139aaa0c28b7723d6dd
need to fix NLS.h problem

diff -r 75e5bb1e0aa1 -r ac56489c2ca6 configure.ac
--- a/configure.ac	Sat Mar 03 11:44:47 2012 -0600
+++ b/configure.ac	Sat Mar 03 12:06:10 2012 -0600
@@ -5,25 +5,37 @@
 dnl TODO: change this to gba.cpp or something
 AC_CONFIG_SRCDIR([src/lua/lopcodes.c])
 AC_CONFIG_HEADERS([config.h])
+
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
 AC_PROG_RANLIB
 
 # Checks for header files.
 AC_CHECK_HEADERS([limits.h locale.h stddef.h stdlib.h string.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_CHECK_TYPES([ptrdiff_t])
 
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_MKTIME
+AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_STRCOLL
-AC_CHECK_FUNCS([floor localeconv memchr modf pow setlocale sqrt strchr strcspn strerror strpbrk strrchr strstr strtoul])
+AC_CHECK_FUNCS([floor localeconv memchr memset  dnl
+                modf pow setlocale sqrt         dnl
+                strchr strcspn strerror         dnl
+                strpbrk strrchr strstr strtoul])
 
 AC_CONFIG_FILES([Makefile 
 	         src/Makefile
-                 src/lua/Makefile])
+                 src/lua/Makefile
+		 src/gb/Makefile])
 
 AM_INIT_AUTOMAKE([dist-bzip2])
 
diff -r 75e5bb1e0aa1 -r ac56489c2ca6 src/Makefile.am
--- a/src/Makefile.am	Sat Mar 03 11:44:47 2012 -0600
+++ b/src/Makefile.am	Sat Mar 03 12:06:10 2012 -0600
@@ -1,1 +1,1 @@
-SUBDIRS = lua
+SUBDIRS = lua gb
diff -r 75e5bb1e0aa1 -r ac56489c2ca6 src/gb/Makefile.am
--- a/src/gb/Makefile.am	Sat Mar 03 11:44:47 2012 -0600
+++ b/src/gb/Makefile.am	Sat Mar 03 12:06:10 2012 -0600
@@ -1,21 +1,24 @@
 noinst_LIBRARIES = libgb.a
 
 libgb_a_SOURCES = \
-	gbCheats.cpp	\
 	gbCheats.h	\
 	gbCodesCB.h	\
 	gbCodes.h	\
+	gbGlobals.h	\
+	GB.h		\
+	gbMemory.h	\
+	gbPrinter.h	\
+	gbSGB.h		\
+	gbSound.h	\
+			\
+	gbCheats.cpp	\
 	GB.cpp		\
-	GB.h		\
 	gbDis.cpp	\
 	gbGfx.cpp	\
 	gbGlobals.cpp	\
-	gbGlobals.h	\
 	gbMemory.cpp	\
-	gbMemory.h	\
 	gbPrinter.cpp	\
-	gbPrinter.h	\
 	gbSGB.cpp	\
-	gbSGB.h		\
-	gbSound.cpp	\
-	gbSound.h
+	gbSound.cpp	
+
+