Move projects from top level to contrib

server build probably broken

Jamroot

@@ -116,6 +116,6 @@ install dist :
   moses-cmd/src//programs
   CreateOnDisk/src//CreateOnDisk
   mert//programs
-  server//mosesserver
+  contrib/server//mosesserver
   misc//programs
   : <location>$(install-location) <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(install-location) <link>shared:<install-type>LIB ;

Makefile.am

@@ -9,6 +9,6 @@ if WITH_MERT
     MERT = mert
 endif
 if WITH_SERVER
-    SERVER = server
+    SERVER = contrib/server
 endif
 SUBDIRS = util lm moses/src OnDiskPt/src moses-cmd/src misc moses-chart-cmd/src CreateOnDisk/src $(MERT) $(SERVER)

config.h.in

@@ -100,6 +100,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

configure.in

@@ -327,6 +327,6 @@ AC_CHECK_HEADER(zlib.h,
 LIBS="$LIBS -lz"
 
 
-AC_CONFIG_FILES(Makefile OnDiskPt/src/Makefile moses/src/Makefile moses-cmd/src/Makefile moses-chart-cmd/src/Makefile misc/Makefile mert/Makefile server/Makefile CreateOnDisk/src/Makefile util/Makefile lm/Makefile)
+AC_CONFIG_FILES(Makefile OnDiskPt/src/Makefile moses/src/Makefile moses-cmd/src/Makefile moses-chart-cmd/src/Makefile misc/Makefile mert/Makefile contrib/server/Makefile CreateOnDisk/src/Makefile util/Makefile lm/Makefile)
 
 AC_OUTPUT()