commit d4065de9db7c59ba57fe7ee8ac569115ebe8e557
Merge: 75c1ac5 b816867
Author: Hrvoje Ribicic <[email protected]>
Date: Thu May 8 14:51:06 2014 +0000
Merge branch 'stable-2.9' into stable-2.10
* stable-2.9
Add configure option to pass GHC flags
KVM: set IFF_ONE_QUEUE on created tap interfaces
Conflicts:
configure.ac # Taken both contributions
diff --cc configure.ac
index 4130845,63c6b70..b4cb5f9
--- a/configure.ac
+++ b/configure.ac
@@@ -24,42 -24,15 +24,51 @@@ AC_SUBST([VERSION_REVISION], gnt_versio
AC_SUBST([VERSION_SUFFIX], gnt_version_suffix)
AC_SUBST([VERSION_FULL], gnt_version_full)
+AC_SUBST([BINDIR], $bindir)
+AC_SUBST([SBINDIR], $sbindir)
+AC_SUBST([MANDIR], $mandir)
+
+# --enable-versionfull
+AC_ARG_ENABLE([versionfull],
+ [AS_HELP_STRING([--enable-versionfull],
+ m4_normalize([use the full version string rather
+ than major.minor for version directories]))],
+ [[if test "$enableval" != no; then
+ USE_VERSION_FULL=yes
+ else
+ USER_VERSION_FULL=no
+ fi
+ ]],
+ [USE_VERSION_FULL=no
+ ])
+AC_SUBST(USE_VERSION_FULL, $USE_VERSION_FULL)
+AM_CONDITIONAL([USE_VERSION_FULL], [test "$USE_VERSION_FULL" = yes])
+
+# --enable-symlinks
+AC_ARG_ENABLE([symlinks],
+ [AS_HELP_STRING([--enable-symlinks],
+ m4_normalize([also install version-dependent symlinks
under
+ $sysconfdir (default: enabled)]))],
+ [[if test "$enableval" != no; then
+ INSTALL_SYMLINKS=yes
+ else
+ INSTALL_SYMLINKS=no
+ fi
+ ]],
+ [INSTALL_SYMLINKS=yes
+ ])
+AC_SUBST(INSTALL_SYMLINKS, $INSTALL_SYMLINKS)
+AM_CONDITIONAL([INSTALL_SYMLINKS], [test "$INSTALL_SYMLINKS" = yes])
+
+ # --with-haskell-flags=
+ AC_ARG_WITH([haskell-flags],
+ [AS_HELP_STRING([--with-haskell-flags=FLAGS],
+ [Extra flags to pass to GHC]
+ )],
+ [hextra_configure="$withval"],
+ [hextra_configure=""])
+ AC_SUBST(HEXTRA_CONFIGURE, $hextra_configure)
+
# --with-ssh-initscript=...
AC_ARG_WITH([ssh-initscript],
[AS_HELP_STRING([--with-ssh-initscript=SCRIPT],
