- reverted r2497

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2498 3789f03b-4d11-0410-bbf8-ca57d06f2519

Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = common unix

configure.ac

@@ -1,8 +0,0 @@
-AC_PREREQ(2.61)
-AC_INIT([tightvnc], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
-AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
-
-AC_CONFIG_SUBDIRS([common
-                   unix])
-
-AC_OUTPUT([Makefile])

unix/Makefile.am

@@ -1,3 +1,3 @@
-SUBDIRS = tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@
+SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@
 
 ACLOCAL_AMFLAGS = -I m4

unix/configure.ac

@@ -5,6 +5,8 @@ AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
 
 AC_SUBST([COMMON_DIR], ['$(top_srcdir)/../common'])
 
+AC_CONFIG_SUBDIRS([../common])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX