Rename folder 'src' to 'midori'

Makefile.am

@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = katze src po data
+SUBDIRS = katze midori po data
 
 desktopdir = $(datadir)/applications
 desktop_in_files = midori.desktop

configure.in

@@ -1,6 +1,6 @@
 # Register ourselves to autoconf
 AC_INIT([midori], [0.0.18], [christian@twotoasts.de])
-AC_CONFIG_SRCDIR([src/main.h])
+AC_CONFIG_SRCDIR([midori/main.h])
 AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
@@ -101,19 +101,8 @@ fi
 AC_CONFIG_FILES([
     Makefile       \
     katze/Makefile \
-    src/Makefile   \
+    midori/Makefile   \
     po/Makefile.in \
     data/Makefile
 ])
 AC_OUTPUT
-
-# Show us what we have
-echo
-echo "    GTK+2        $GTK_VER"
-echo "    WebKit       $WEBKIT_VER"
-echo "    Libsexy      $LIBSEXY_VER"
-echo "    libXML2      $LIBXML_VER"
-echo
-echo "    Debugging    $enable_debug"
-echo
-echo "    Prefix       $prefix"

wscript

@@ -23,8 +23,7 @@ def configure (conf):
     conf.check_tool ('compiler_cc')
     if not Params.g_options.disable_nls:
         conf.check_tool ('intltool')
-        # FIXME if we have intltool but not msgfmt the build breaks
-        if conf.env['INTLTOOL']:
+        if conf.env['INTLTOOL'] and conf.env['POCOM']:
             nls = 'yes'
             conf.define ('ENABLE_NLS', 1)
             conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0)
@@ -69,7 +68,7 @@ def set_options (opt):
         help='Disables native language support', dest='disable_nls')
 
 def build (bld):
-    bld.add_subdirs ('katze src data')
+    bld.add_subdirs ('katze midori data')
 
     if bld.env ()['INTLTOOL']:
         bld.add_subdirs ('po')