Permalink
Browse files

Add support for building Gambit with emscripten C to JavaScript compiler

  • Loading branch information...
1 parent 6f89de2 commit 1ff95e63a04d9f7130a1595e9f4071564aa8e101 @feeley feeley committed Apr 23, 2013
View
3 bin/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C bin directory.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = bin
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
105 configure
@@ -11,7 +11,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
@@ -726,6 +726,7 @@ bat
obj
exe
srcdirpfx
+AR
RANLIB
LN_S
X_EXTRA_LIBS
@@ -1690,7 +1691,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
_ACEOF
exit
fi
@@ -11903,6 +11904,103 @@ else
RANLIB="$ac_cv_prog_RANLIB"
fi
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_AR" = x; then
+ AR="ar"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+else
+ AR="$ac_cv_prog_AR"
+fi
+
+
RC="git"
GIT="git"
HG="hg"
@@ -11986,7 +12084,7 @@ else
LIB_PREFIX="lib"
LIB_EXTENSION=".a"
- MAKE_LIBRARY='ar rc $(LIBRARY) $(LIBRARY_OBJECTS) && $(RANLIB) $(LIBRARY)'
+ MAKE_LIBRARY='$(AR) rc $(LIBRARY) $(LIBRARY_OBJECTS) && $(RANLIB) $(LIBRARY)'
MAKE_LIBRARY_FOR_INSTALL=':'
FIXLIB='$(RANLIB)'
LINK_FOR_INSTALL=':'
@@ -12455,6 +12553,7 @@ INSTALL_PROGRAM='$(rootfromhere)/install-sh -c -m 755'
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
View
11 configure.ac
@@ -17,7 +17,7 @@ AC_SUBST(PACKAGE_STRING)
AC_SUBST(PACKAGE_BUGREPORT)
AC_SUBST(PACKAGE_TARNAME)
-AC_COPYRIGHT([[Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.]])
+AC_COPYRIGHT([[Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.]])
AC_CONFIG_SRCDIR(include/gambit.h.in)
@@ -1638,6 +1638,12 @@ AC_PATH_XTRA
AC_PROG_LN_S
AC_PROG_RANLIB
+
+AN_MAKEVAR([AR], [AC_PROG_AR])
+AN_PROGRAM([ar], [AC_PROG_AR])
+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])])
+AC_PROG_AR
+
RC="git"
GIT="git"
HG="hg"
@@ -1721,7 +1727,7 @@ else
LIB_PREFIX="lib"
LIB_EXTENSION=".a"
- MAKE_LIBRARY='ar rc $(LIBRARY) $(LIBRARY_OBJECTS) && $(RANLIB) $(LIBRARY)'
+ MAKE_LIBRARY='$(AR) rc $(LIBRARY) $(LIBRARY_OBJECTS) && $(RANLIB) $(LIBRARY)'
MAKE_LIBRARY_FOR_INSTALL=':'
FIXLIB='$(RANLIB)'
LINK_FOR_INSTALL=':'
@@ -2171,6 +2177,7 @@ AC_SUBST(INSTALL_LIB)
AC_SUBST(INSTALL_PROGRAM)
AC_SUBST(LN_S)
AC_SUBST(RANLIB)
+AC_SUBST(AR)
AC_SUBST(RC)
AC_SUBST(GIT)
AC_SUBST(HG)
View
3 contrib/GambitREPL/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit REPL app.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = contrib/GambitREPL
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 contrib/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C contributed softwares.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = contrib
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 doc/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C documentation.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = doc
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/Xlib-simple/makefile.in
@@ -1,6 +1,6 @@
# makefile for Xlib-simple example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/Xlib-simple
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/distr-comp/makefile.in
@@ -1,6 +1,6 @@
# makefile for distr-comp example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/distr-comp
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C examples.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/misc/makefile.in
@@ -1,6 +1,6 @@
# makefile for misc example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/misc
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/pi/makefile.in
@@ -1,6 +1,6 @@
# makefile for pi example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/pi
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/pthread/makefile.in
@@ -1,6 +1,6 @@
# makefile for pthread example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/pthread
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/ring/makefile.in
@@ -1,6 +1,6 @@
# makefile for ring example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/ring
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/tcltk/makefile.in
@@ -1,6 +1,6 @@
# makefile for Tcl/Tk example.
-# Copyright (c) 1997-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1997-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/tcltk
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/web-repl/makefile.in
@@ -1,6 +1,6 @@
# makefile for web-repl example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/web-repl
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 examples/web-server/makefile.in
@@ -1,6 +1,6 @@
# makefile for web-server example.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = examples/web-server
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
1 gsc/makefile.in
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 gsi/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C interpreter.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = gsi
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 include/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C include directory.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = include
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
4 include/stamp.h
@@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/
-#define ___STAMP_YMD 20130422
-#define ___STAMP_HMS 25302
+#define ___STAMP_YMD 20130423
+#define ___STAMP_HMS 25011
View
3 lib/guide/images/makefile.in
@@ -1,6 +1,6 @@
# makefile for GUIDE images.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = lib/guide/images
rootfromhere = ../../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 lib/guide/makefile.in
@@ -1,6 +1,6 @@
# makefile for GUIDE library.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = lib/guide
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 lib/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C library.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = lib
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
1 makefile.in
@@ -36,6 +36,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 misc/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C miscellanea.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = misc
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 prebuilt/macosx/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C build on MacOS X.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = prebuilt/macosx
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 prebuilt/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C builds.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = prebuilt
rootfromhere = ..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
3 prebuilt/windows/makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C build on Windows.
-# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2013 by Marc Feeley, All Rights Reserved.
herefromroot = prebuilt/windows
rootfromhere = ../..
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@
View
1 tests/makefile.in
@@ -40,6 +40,7 @@ INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LN_S = @LN_S@
RANLIB = @RANLIB@
+AR = @AR@
RC = @RC@
GIT = @GIT@
HG = @HG@

0 comments on commit 1ff95e6

Please sign in to comment.