Browse files

Compared configure.ac with latest stable configure.ac (at 5fb450b) an…

…d re-added some good functionality (i.e.: checking for `go` instead of `6g`, etc.).
  • Loading branch information...
1 parent d85c7b2 commit 450e356a8549ccd02b69c0d496f449a2a5519bfa @GeertJohan GeertJohan committed Nov 5, 2012
Showing with 4 additions and 35 deletions.
  1. +4 −35 configure.ac
View
39 configure.ac
@@ -81,14 +81,6 @@ AC_ARG_VAR([GOROOT], [Prefix for the Go source directory.
Default = "/usr/local/share/go"])
AS_IF([test "x$GOROOT" = x], [GOROOT="/usr/local/share/go"])
-AC_ARG_VAR([GOARCH], [Architecture default for Go.
- Default = "amd64"])
-AS_IF([test "x$GOARCH" = x], [GOARCH="amd64"])
-
-AC_ARG_VAR([GOBIN], [Binary directory for Go.
- Default = "/usr/local/bin"])
-AS_IF([test "x$GOBIN" = x], [GOBIN="/usr/local/bin"])
-
AC_ARG_VAR([D_IMPORT_PREFIX], [Prefix for installing D modules.
[INCLUDEDIR/d2]])
AS_IF([test "x$D_IMPORT_PREFIX" = x], [D_IMPORT_PREFIX="${includedir}/d2"])
@@ -270,29 +262,9 @@ AM_CONDITIONAL(WITH_HASKELL, [test "$have_haskell" = "yes"])
AX_THRIFT_LIB(go, [Go], yes)
if test "$with_go" = "yes"; then
- case X"$GOARCH" in
- Xamd64)
- GOARCH_NUM=6
- ;;
- X386)
- GOARCH_NUM=8
- ;;
- Xarm)
- GOARCH_NUM=5
- ;;
- *)
- GOARCH_NUM=6
- ;;
- esac
- GO_C=${GOBIN}/${GOARCH_NUM}g
- GO_L=${GOBIN}/${GOARCH_NUM}l
- GOMAKE=${GOBIN}/gomake
- GOINSTALL=${GOBIN}/goinstall
- AC_PATH_PROG([GO_C], [${GOARCH_NUM}g])
- AC_PATH_PROG([GO_L], [${GOARCH_NUM}l])
- AC_PATH_PROG([GOMAKE], [gomake])
- AC_PATH_PROG([GOINSTALL], [goinstall])
- if [[ -x "$GO_C" -a -x "$GO_L" -a -x "$GOMAKE" -a -x "$GOINSTALL" ]] ; then
+ GO=${GOROOT}/bin/go
+ AC_PATH_PROG([GO], [${GO}])
+ if [[ -x "$GO" ]] ; then
have_go="yes"
fi
fi
@@ -593,6 +565,7 @@ AC_CONFIG_FILES([
lib/d/Makefile
lib/d/test/Makefile
lib/erl/Makefile
+ lib/go/Makefile
lib/hs/Makefile
lib/java/Makefile
lib/js/test/Makefile
@@ -686,10 +659,6 @@ if test "$have_go" = "yes" ; then
echo
echo "Go Library:"
echo " Using GOROOT............... : $GOROOT"
- echo " Using GOBIN................ : $GOBIN"
- echo " Using GOARCH............... : $GOARCH"
- echo " Using GO Compiler.......... : $GO_C"
- echo " Using GO Linker............ : $GO_L"
fi
if test "$have_d" = "yes" ; then
echo

0 comments on commit 450e356

Please sign in to comment.