CVS: allegro aclocal.m4,1.57,1.58 configure.in,1.73,1.74 makefile.in,1.56,1.57

[Eric B. <ebo...@us...>]

Update of /cvsroot/alleg/allegro
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25693

Modified Files:
	aclocal.m4 configure.in makefile.in 
Log Message:
Improved the cross-compilation support on Linux.

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/alleg/allegro/aclocal.m4,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- aclocal.m4	28 Feb 2004 13:24:34 -0000	1.57
+++ aclocal.m4	30 Mar 2004 07:02:12 -0000	1.58
@@ -565,7 +565,7 @@
     int main (void) { return (notsupported); }],
   allegro_support_constructor=yes,
   allegro_support_constructor=no,
-  allegro_support_constructor=no)
+  allegro_support_constructor=yes)
 else
   allegro_support_constructor=no
 fi

Index: configure.in
===================================================================
RCS file: /cvsroot/alleg/allegro/configure.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- configure.in	1 Mar 2004 19:04:46 -0000	1.73
+++ configure.in	30 Mar 2004 07:02:12 -0000	1.74
@@ -628,12 +628,9 @@
 AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
-
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
 AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memcmp mkstemp stricmp strlwr strupr)
+
+AC_CHECK_FUNCS(mmap memcmp mkstemp stricmp strlwr strupr vprintf)
 
 dnl Tweak header files for library build
 CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD"

Index: makefile.in
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- makefile.in	12 Sep 2003 22:44:35 -0000	1.56
+++ makefile.in	30 Mar 2004 07:02:12 -0000	1.57
@@ -58,8 +58,8 @@
 CONFIGURE_IN = configure.in
 ACLOCAL_M4 = aclocal.m4
 
-INCLUDES =
-DEFS = @DEFS@ -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro -I.
+INCLUDES = -I. -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro
+DEFS = @DEFS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 PROG_LDFLAGS = @PROG_LDFLAGS@
@@ -212,9 +212,22 @@
 	$(srcdir)/include/allegro/internal/aintvga.h
 obj_unix_asmdef_inc = $(OBJDIR)/asmdef.inc
 
+ifdef CROSSCOMPILE
+
+$(OBJDIR)/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h
+	$(CC) $(INCLUDES) `echo $(CFLAGS) | sed -e "s/.*\(-DALLEGRO_USE_C\).*/\1/"` -S -o $(OBJDIR)/asmdef.s src/i386/asmdef.c
+
+$(obj_unix_asmdef_inc): $(OBJDIR)/asmdef.s
+	@if [ ! -x misc/asmdef.sh ]; then chmod a+x misc/asmdef.sh; fi
+	misc/asmdef.sh $(OBJDIR)/asmdef.s $(obj_unix_asmdef_inc)
+
+else
+
 $(obj_unix_asmdef_inc): src/i386/asmdef$(EXE)
 	src/i386/asmdef$(EXE) $(obj_unix_asmdef_inc)
 
+endif
+
 
 
 # -------- documentation --------
@@ -322,8 +335,16 @@
 
 -include makefile.dep
 
+ifdef CROSSCOMPILE
+
+full-build: lib modules programs
+
+else
+
 full-build: lib modules programs docs
 
+endif
+
 lib: $(ALLEGRO_LIB_TARGETS)
 
 modules: $(ALLEGRO_MODULE_TARGETS)