Author: eelco
Date: Mon Nov 21 12:23:48 2011
New Revision: 30503
URL: https://nixos.org/websvn/nix/?rev=30503&sc=1
Log:
* Put back the "sys_name" variable which got removed somewhere. This
broke building on Cygwin and Solaris.
Modified:
nix/trunk/configure.ac
Modified: nix/trunk/configure.ac
==============================================================================
--- nix/trunk/configure.ac Mon Nov 21 12:18:26 2011 (r30502)
+++ nix/trunk/configure.ac Mon Nov 21 12:23:48 2011 (r30503)
@@ -33,6 +33,14 @@
system="$machine_name-`echo $host_os | "$SED"
-e's/@<:@0-9.@:>@*$//g'`";;
esac])
+sys_name=$(uname -s | tr 'A-Z ' 'a-z_')
+
+case $sys_name in
+ cygwin*)
+ sys_name=cygwin
+ ;;
+esac
+
AC_MSG_RESULT($system)
AC_SUBST(system)
AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')])
@@ -54,7 +62,7 @@
# Solaris-specific stuff.
-if test "$sys_name" = "sunos"; then
+if [ "$sys_name" = sunos ]; then
# Solaris requires -lsocket -lnsl for network functions
LIBS="-lsocket -lnsl $LIBS"
fi
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
