diff --git a/configure b/configure
index 5ede6b6004776313e0d5a5157c44a613261bad2b..46c7e0f469acdc00929e46db7899db462bf63a72 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lektor 1.8-2.
+# Generated by GNU Autoconf 2.69 for lektor 2.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='lektor'
PACKAGE_TARNAME='lektor'
-PACKAGE_VERSION='1.8-2'
-PACKAGE_STRING='lektor 1.8-2'
+PACKAGE_VERSION='2.0'
+PACKAGE_STRING='lektor 2.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lektor 1.8-2 to adapt to many kinds of systems.
+\`configure' configures lektor 2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,7 +1402,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lektor 1.8-2:";;
+ short | recursive ) echo "Configuration of lektor 2.0:";;
esac
cat <<\_ACEOF
@@ -1516,7 +1516,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lektor configure 1.8-2
+lektor configure 2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1978,7 +1978,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lektor $as_me 1.8-2, which was
+It was created by lektor $as_me 2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4814,7 +4814,7 @@ fi
# Define the identity of the package.
PACKAGE='lektor'
- VERSION='1.8-2'
+ VERSION='2.0'
# Some tools Automake needs.
@@ -12777,7 +12777,7 @@ if test "${enable_static+set}" = set; then :
;;
esac
else
- enable_static=no
+ enable_static=yes
fi
@@ -13530,12 +13530,14 @@ else
LKT_DEBUG_ENABLED=no
fi
+if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
cat >>confdefs.h <<_ACEOF
#define LKT_DEBUG_ENABLED "$LKT_DEBUG_ENABLED"
_ACEOF
+fi
# Check whether --enable-static-module was given.
if test "${enable_static_module+set}" = set; then :
@@ -13552,7 +13554,7 @@ else
LKT_STATIC_MODULE_FALSE=
fi
-if test "x${LKT_STATIC_MODULE}" ; then
+if test "x${LKT_STATIC_MODULE}" = "xyes" ; then
$as_echo "#define LKT_STATIC_MODULE /**/" >>confdefs.h
@@ -13609,8 +13611,8 @@ fi
# CFLAGS #
##########
-BASEFLAGS="-Werror -Wall -I../inc/"
-if test "x${LKT_DEBUG_ENABLED}" = "xyes"; then
+BASEFLAGS="-Werror -Wall"
+if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
BASEFLAGS+=" -g"
else
BASEFLAGS+=" -O3"
@@ -14163,7 +14165,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lektor $as_me 1.8-2, which was
+This file was extended by lektor $as_me 2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14229,7 +14231,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-lektor config.status 1.8-2
+lektor config.status 2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -15937,6 +15939,8 @@ LKT_CONFIG_RESULT="
### Build options
#
# Modules.............. $(test $LKT_STATIC_MODULE = 'yes' && echo static || echo not static)
+# C Flags.............. $CFLAGS
+# To link against...... -Wl,-rpath -Wl,$prefix/lib
#
### Other informations
#
diff --git a/configure.ac b/configure.ac
index 7731d29a20687ac9997d61ab4d64c8dde16ab012..e6212db7bd6e6cd306ee96db9a6f5c1fe944797d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lektor], [1.8-2])
+AC_INIT([lektor], [2.0])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIRS([config/m4])
@@ -67,7 +67,7 @@ LT_INIT
LT_LANG([C])
AC_ENABLE_SHARED
-AC_DISABLE_STATIC
+AC_ENABLE_STATIC
AC_PROG_CC
AC_PROG_INSTALL
@@ -82,8 +82,10 @@ AC_ARG_ENABLE([debug],
[Enable debug so you can use gdb])],
[LKT_DEBUG_ENABLED=yes],
[LKT_DEBUG_ENABLED=no])
-AC_DEFINE_UNQUOTED([LKT_DEBUG_ENABLED], ["$LKT_DEBUG_ENABLED"], [Enable debug])
-AC_SUBST([LKT_DEBUG_ENABLED])
+if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
+ AC_DEFINE_UNQUOTED([LKT_DEBUG_ENABLED], ["$LKT_DEBUG_ENABLED"], [Enable debug])
+ AC_SUBST([LKT_DEBUG_ENABLED])
+fi
AC_ARG_ENABLE([static-module],
[AS_HELP_STRING([--enable-static-module],
@@ -91,7 +93,7 @@ AC_ARG_ENABLE([static-module],
[LKT_STATIC_MODULE=yes],
[LKT_STATIC_MODULE=no])
AM_CONDITIONAL([LKT_STATIC_MODULE], [test "x${LKT_STATIC_MODULE}" = "xyes"])
-if test "x${LKT_STATIC_MODULE}" ; then
+if test "x${LKT_STATIC_MODULE}" = "xyes" ; then
AC_DEFINE([LKT_STATIC_MODULE], [], [Build with modules inside liblektor])
AC_SUBST([LKT_STATIC_MODULE])
fi
@@ -122,8 +124,8 @@ fi
# CFLAGS #
##########
-BASEFLAGS="-Werror -Wall -I../inc/"
-if test "x${LKT_DEBUG_ENABLED}" = "xyes"; then
+BASEFLAGS="-Werror -Wall"
+if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
BASEFLAGS+=" -g"
else
BASEFLAGS+=" -O3"
@@ -156,6 +158,8 @@ LKT_CONFIG_RESULT="
### Build options
#
# Modules.............. $(test $LKT_STATIC_MODULE = 'yes' && echo static || echo not static)
+# C Flags.............. $CFLAGS
+# To link against...... -Wl,-rpath -Wl,$prefix/lib
#
### Other informations
#
diff --git a/inc/lektor/common.h b/inc/lektor/common.h
index ad703fbc6cb47e555586cea69998c57361e9335b..12bfb5fca8020c900b46562f34ee0e8d7afd2b8f 100644
--- a/inc/lektor/common.h
+++ b/inc/lektor/common.h
@@ -8,10 +8,6 @@
/* Max value for any buffer, to not squash the stack. */
#define BUFFER_MAX 4096
-#ifndef __GNUC__
- #define inline
-#endif
-
#ifndef MAX
#define MAX(a, b) ((a) < (b) ? (b) : (a))
#endif /* MAX */