merge branch origin/master

[Rakka.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 05516ed863daf23a7aa20b9654d59125da239c52..4f72c76916b87cbd85565e28a2194f0513eab946 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Rakka], [], [phonohawk at ps dot sakura dot ne dot jp])
+AC_INIT([Rakka], [], [pho at cielonegro dot org])
 
 AC_CONFIG_SRCDIR([Rakka.cabal])
 
@@ -9,31 +9,18 @@ AC_CONFIG_SRCDIR([Rakka.cabal])
 if test "x$prefix" = "xNONE"; then
    prefix=$ac_default_prefix
 fi
+if test "x$exec_prefix" = "xNONE"; then
+   exec_prefix="$prefix"
+fi
 
 RAKKA_LOCALSTATEDIR=`eval echo "$localstatedir"`/rakka
 AC_SUBST([RAKKA_LOCALSTATEDIR])
 
-
-# Since the Cabal executes ./configure with no arguments, the only way
-# we can receive options from user is to see environment variables.
-AC_ARG_VAR([BUILD_TEST_SUITE], [build and install the test suite. (yes / no) (default: no)])
-if test "$BUILD_TEST_SUITE" = ""; then
-  BUILD_TEST_SUITE=False
-else
-  if test "$BUILD_TEST_SUITE" = "yes"; then
-    BUILD_TEST_SUITE=True
-  else
-     if test "$BUILD_TEST_SUITE" = "no"; then
-       BUILD_TEST_SUITE=False
-     else
-       AC_MSG_ERROR([BUILD_TEST_SUITE must be either yes or no.])
-     fi
-  fi
-fi
+RAKKA_BINDIR=`eval echo "$bindir"`
+AC_SUBST([RAKKA_BINDIR])
 
 
-AC_CONFIG_FILES([
-        Rakka.buildinfo
-])
+AC_CONFIG_FILES([Rakka.buildinfo])
+AC_CONFIG_FILES([rc.d/NetBSD/rakka], [chmod +x rc.d/NetBSD/rakka])
 AC_OUTPUT