- reverted r2497

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

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644 (file)
index c52b347..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = common unix

diff --git a/configure.ac b/configure.ac
deleted file mode 100644 (file)
index c893761..0000000
--- a/configure.ac
+++ /dev/null
@@ -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])

diff --git a/unix/Makefile.am b/unix/Makefile.am
index 246fbd702a3784801b436d97721ddc25d09f6dec..59dbc221b4956553a8bd4953b02b31ef9c9d6332 100644 (file)
--- a/unix/Makefile.am
+++ b/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

diff --git a/unix/configure.ac b/unix/configure.ac
index c0c2adfb787374fc8d68e442bbfba8a4da501a03..8c9d37d2dbcd5ece74485e5e56574c85d6be4080 100644 (file)
--- a/unix/configure.ac
+++ b/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