From bf98c2110d0565e0b47fbaec629da82f1a3f9bec Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Thu, 17 Apr 2008 15:25:41 +0000
Subject: [PATCH] - use AC_CONFIG_SUBDIRS in unix/configure.ac to configure
 common subtree - use AC_INIT to define PACKAGE_NAME and PACKAGE_VERSION

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2486 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 unix/configure.ac | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/unix/configure.ac b/unix/configure.ac
index 0b65df14..875785ee 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -1,28 +1,15 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(vncviewer/vncviewer.cxx)
+AC_PREREQ([2.61])
+AC_INIT([tightvnc], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
 
-PACKAGE=tightvnc
-VERSION=1.5.0
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-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
+AC_CONFIG_SUBDIRS([../common])
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 case "`(uname -sr) 2>/dev/null`" in
 "SunOS 5"*)
-- 
2.39.5