Updated build scripts in unix/ for new directory layout.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@617 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/Makefile.in b/unix/Makefile.in
index be38406..34b0a04 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2,7 +2,6 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SUBDIRS = @ZLIB_DIR@ @JPEG_DIR@ intl rdr network Xregion rfb tx x0vncserver \
- vncviewer_unix po vncpasswd @VNCCONFIG_DIR@
+SUBDIRS = ../common intl tx x0vncserver vncviewer po vncpasswd @VNCCONFIG_DIR@
# followed by boilerplate.mk
diff --git a/unix/README b/unix/README
index 7787172..2b2fd80 100644
--- a/unix/README
+++ b/unix/README
@@ -132,7 +132,7 @@
/usr/local/vnc/classes:
% mkdir -p /usr/local/vnc/classes
- % cp java/* /usr/local/vnc/classes
+ % cp ../common/javabin/* /usr/local/vnc/classes
We recommend that you use the vncserver script to run Xvnc for you. You can
edit the script as appropriate for your site. Things you may need to change
diff --git a/unix/common.mk b/unix/common.mk
new file mode 100644
index 0000000..95a8753
--- /dev/null
+++ b/unix/common.mk
@@ -0,0 +1,2 @@
+COMMON = @top_srcdir@/../common
+TOP = @top_srcdir@
diff --git a/unix/configure.in b/unix/configure.in
index 9b58f27..eaddfcd 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(vncviewer_unix/vncviewer.cxx)
+AC_INIT(vncviewer/vncviewer.cxx)
PACKAGE=tightvnc
VERSION=1.5.0
@@ -8,6 +8,11 @@
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
+dnl Configure the common directory
+echo "configuring common..."
+(cd ../common; ./configure $*)
+echo "...done configuring common"
+
dnl dirty hack to prevent use of -g in CFLAGS and CXXFLAGS
ac_cv_prog_cc_g=no
ac_cv_prog_cxx_g=no
@@ -71,12 +76,9 @@
echo "using installed zlib"
ZLIB_LIB=-lz
else
- ZLIB_DIR=zlib
- ZLIB_INCLUDE='-I$(top_srcdir)/zlib'
- ZLIB_LIB='$(top_srcdir)/zlib/libz.a'
- echo "configuring zlib..."
- (cd zlib; ./configure)
- echo "...done configuring zlib"
+ ZLIB_DIR='$(COMMON)/zlib'
+ ZLIB_INCLUDE='-I$(COMMON)/zlib'
+ ZLIB_LIB='$(COMMON)/zlib/libz.a'
fi
AC_SUBST(ZLIB_DIR)
@@ -91,12 +93,9 @@
echo "using installed jpeg"
JPEG_LIB=-ljpeg
else
- JPEG_DIR=jpeg/build
- JPEG_INCLUDE='-I$(top_srcdir)/jpeg'
- JPEG_LIB='$(top_srcdir)/jpeg/build/libjpeg.a'
- echo "configuring jpeg..."
- (mkdir jpeg/build; cd jpeg/build; ../configure)
- echo "...done configuring jpeg"
+ JPEG_DIR='$(COMMON)/jpeg/build'
+ JPEG_INCLUDE='-I$(COMMON)/jpeg'
+ JPEG_LIB='$(COMMON)/jpeg/build/libjpeg.a'
fi
AC_SUBST(JPEG_DIR)
@@ -110,7 +109,7 @@
echo "vncconfig utility will not be built"
VNCCONFIG_DIR=
else
- VNCCONFIG_DIR='vncconfig_unix'
+ VNCCONFIG_DIR='vncconfig'
fi
AC_SUBST(VNCCONFIG_DIR)
@@ -139,17 +138,6 @@
fi
AC_SUBST(READDISPLAY_DEFINE)
-AC_CHECK_FUNC(vsnprintf,VSNPRINTF_DEFINE='-DHAVE_VSNPRINTF',VSNPRINTF_DEFINE=)
-AC_SUBST(VSNPRINTF_DEFINE)
-
-AC_CHECK_FUNC(strcasecmp,STRCASECMP_DEFINE='-DHAVE_STRCASECMP',
- STRCASECMP_DEFINE=)
-AC_SUBST(STRCASECMP_DEFINE)
-
-AC_CHECK_FUNC(strncasecmp,STRNCASECMP_DEFINE='-DHAVE_STRNCASECMP',
- STRNCASECMP_DEFINE=)
-AC_SUBST(STRNCASECMP_DEFINE)
-
dnl Under Lynx/OS 2.3, we have to link with -lbsd to resolve
dnl gethostbyname, inet_addr, htons etc. Check if it's necessary.
dnl NOTE: Did not want to use AC_SEARCH_LIBS which would add
@@ -163,18 +151,6 @@
AC_LANG_RESTORE
AC_SUBST(INET_LIB)
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE(
-[#include <sys/types.h>
- #include <sys/socket.h>],
-[socklen_t x;
-accept(0, 0, &x);],
-AC_MSG_RESULT(yes)
-SOCKLEN_T_DEFINE='-DVNC_SOCKLEN_T=socklen_t',
-AC_MSG_RESULT(using int)
-SOCKLEN_T_DEFINE='-DVNC_SOCKLEN_T=int')
-AC_SUBST(SOCKLEN_T_DEFINE)
-
AM_GNU_GETTEXT
BOILERPLATE=boilerplate.mk
@@ -185,14 +161,12 @@
fi
fi
-AC_OUTPUT(Makefile:Makefile.in:$BOILERPLATE intl/Makefile po/Makefile.in \
- rdr/Makefile:rdr/Makefile.in:$BOILERPLATE \
- network/Makefile:network/Makefile.in:$BOILERPLATE \
- Xregion/Makefile:Xregion/Makefile.in:$BOILERPLATE \
- rfb/Makefile:rfb/Makefile.in:$BOILERPLATE \
- tx/Makefile:tx/Makefile.in:$BOILERPLATE \
- x0vncserver/Makefile:x0vncserver/Makefile.in:$BOILERPLATE \
- vncviewer_unix/Makefile:vncviewer_unix/Makefile.in:$BOILERPLATE \
- vncconfig_unix/Makefile:vncconfig_unix/Makefile.in:$BOILERPLATE \
- vncpasswd/Makefile:vncpasswd/Makefile.in:$BOILERPLATE \
+AC_OUTPUT(Makefile:common.mk:Makefile.in:$BOILERPLATE \
+ tx/Makefile:common.mk:tx/Makefile.in:$BOILERPLATE \
+ x0vncserver/Makefile:common.mk:x0vncserver/Makefile.in:$BOILERPLATE \
+ vncviewer/Makefile:common.mk:vncviewer/Makefile.in:$BOILERPLATE \
+ vncconfig/Makefile:common.mk:vncconfig/Makefile.in:$BOILERPLATE \
+ vncpasswd/Makefile:common.mk:vncpasswd/Makefile.in:$BOILERPLATE \
+ intl/Makefile \
+ po/Makefile.in \
)
diff --git a/unix/tx/Makefile.in b/unix/tx/Makefile.in
index 89c30b1..92f4494 100644
--- a/unix/tx/Makefile.in
+++ b/unix/tx/Makefile.in
@@ -3,7 +3,7 @@
OBJS = $(SRCS:.cxx=.o)
-DIR_CPPFLAGS = -I$(top_srcdir) @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+DIR_CPPFLAGS = -I$(COMMON) @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
library = libtx.a
diff --git a/unix/vncconfig/Makefile.in b/unix/vncconfig/Makefile.in
index 4891fcd..527a79e 100644
--- a/unix/vncconfig/Makefile.in
+++ b/unix/vncconfig/Makefile.in
@@ -5,12 +5,13 @@
program = vncconfig
-DEP_LIBS = ../tx/libtx.a ../rfb/librfb.a ../network/libnetwork.a \
- ../rdr/librdr.a
+DEP_LIBS = $(TOP)/tx/libtx.a $(COMMON)/rfb/librfb.a \
+ $(COMMON)/network/libnetwork.a \
+ $(COMMON)/rdr/librdr.a
EXTRA_LIBS = @X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
-DIR_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+DIR_CPPFLAGS = -I$(COMMON) -I$(TOP)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
all:: $(program)
diff --git a/unix/vncpasswd/Makefile.in b/unix/vncpasswd/Makefile.in
index 927a7b9..a159b72 100644
--- a/unix/vncpasswd/Makefile.in
+++ b/unix/vncpasswd/Makefile.in
@@ -5,9 +5,9 @@
program = vncpasswd
-DEP_LIBS = ../rfb/librfb.a
+DEP_LIBS = $(COMMON)/rfb/librfb.a
-DIR_CPPFLAGS = -I$(top_srcdir)
+DIR_CPPFLAGS = -I$(COMMON)
all:: $(program)
diff --git a/unix/vncviewer/Makefile.in b/unix/vncviewer/Makefile.in
index 782b680..3f57404 100644
--- a/unix/vncviewer/Makefile.in
+++ b/unix/vncviewer/Makefile.in
@@ -12,12 +12,14 @@
program = vncviewer
-DEP_LIBS = ../tx/libtx.a ../rfb/librfb.a ../network/libnetwork.a \
- ../rdr/librdr.a
+DEP_LIBS = $(TOP)/tx/libtx.a \
+ $(COMMON)/rfb/librfb.a \
+ $(COMMON)/network/libnetwork.a \
+ $(COMMON)/rdr/librdr.a
EXTRA_LIBS = @ZLIB_LIB@ @JPEG_LIB@ @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @LIBINTL@
-DIR_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir) -I$(top_srcdir)/tx -I$(top_srcdir)/intl @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+DIR_CPPFLAGS = -I$(COMMON) -I$(TOP) -I$(TOP)/tx -I$(TOP)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
all:: $(program)
diff --git a/unix/x0vncserver/Makefile.in b/unix/x0vncserver/Makefile.in
index cbb9fed..39e6685 100644
--- a/unix/x0vncserver/Makefile.in
+++ b/unix/x0vncserver/Makefile.in
@@ -1,22 +1,22 @@
SRCS = Image.cxx TimeMillis.cxx PollingScheduler.cxx PollingManager.cxx \
Geometry.cxx \
- x0vncserver.cxx ../vncconfig_unix/QueryConnectDialog.cxx
+ x0vncserver.cxx ../vncconfig/QueryConnectDialog.cxx
OBJS = $(SRCS:.cxx=.o)
program = x0vncserver
-DEP_LIBS = ../rfb/librfb.a \
- ../network/libnetwork.a \
- ../rdr/librdr.a \
- ../tx/libtx.a
+DEP_LIBS = $(COMMON)/rfb/librfb.a \
+ $(COMMON)/network/libnetwork.a \
+ $(COMMON)/rdr/librdr.a \
+ $(TOP)/tx/libtx.a
EXTRA_LIBS = @ZLIB_LIB@ @JPEG_LIB@ @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
@XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@
# X_CFLAGS are really CPPFLAGS
-DIR_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tx -I$(top_srcdir)/vncconfig_unix \
+DIR_CPPFLAGS = -I$(COMMON) -I$(TOP) -I$(TOP)/tx -I$(TOP)/vncconfig \
@XTEST_DEFINE@ @READDISPLAY_DEFINE@ @MITSHM_DEFINE@ @X_CFLAGS@
all:: $(program)
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index 80483bf..96240ea 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -34,7 +34,7 @@
#include <network/TcpSocket.h>
#include <tx/TXWindow.h>
-#include <vncconfig_unix/QueryConnectDialog.h>
+#include <vncconfig/QueryConnectDialog.h>
#include <signal.h>
#include <X11/X.h>