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/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 \
)