From 16f8932ee59b07b0663b35555879dd0013808b51 Mon Sep 17 00:00:00 2001 From: jsorg71 Date: Tue, 12 Aug 2008 05:19:59 +0000 Subject: [PATCH] add some defines, change libdir and version --- configure.ac | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configure.ac b/configure.ac index a6da3718..84c58b1a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ(2.59) AC_INIT([xrdp], [0.5.0], [xrdp-devel@lists.sourceforge.net]) +XRDP_VERSION_INFO=0:5:0 +AC_SUBST(XRDP_VERSION_INFO) AC_CONFIG_HEADERS([config_ac.h:config-h.in]) AM_INIT_AUTOMAKE([1.6 foreign]) AC_PROG_CC @@ -19,6 +21,18 @@ AC_ARG_ENABLE(pamuserpass, AS_HELP_STRING([--enable-pamuserpass], [Build pam userpass support (default: no)]), [pamuserpass=true], [pamuserpass=false]) AM_CONDITIONAL(SESMAN_PAMUSERPASS, [test x$pamuserpass = xtrue]) +libdir="${libdir}/xrdp/"; +if ! test "x${prefix}" = "xNONE" ; then +AC_DEFINE_UNQUOTED([XRDP_CFG_PATH], ["${prefix}/etc/xrdp"], [xrdp config dir]) +AC_DEFINE_UNQUOTED([XRDP_CFG_FILE], ["${prefix}/etc/xrdp/xrdp.ini"], [xrdp config file]) +AC_DEFINE_UNQUOTED([XRDP_KEY_FILE], ["${prefix}/etc/xrdp/rsakeys.ini"], [xrdp key file]) +AC_DEFINE_UNQUOTED([XRDP_KEYMAP_FILE], ["${prefix}/etc/xrdp/km-%4.4x.ini"], [xrdp keymap file]) +AC_DEFINE_UNQUOTED([XRDP_PID_FILE], ["${prefix}/var/run/xrdp.pid"], [xrdp pid file]) +AC_DEFINE_UNQUOTED([XRDP_SBIN_PATH], ["${prefix}/sbin"], [xrdp sbin dir]) +AC_DEFINE_UNQUOTED([XRDP_SHARE_PATH], ["${prefix}/share/xrdp"], [xrdp share dir]) +AC_DEFINE_UNQUOTED([SESMAN_PID_FILE], ["${prefix}/var/run/sesman.pid"], [sesman pid file]) +AC_DEFINE_UNQUOTED([SESMAN_CFG_FILE], ["${prefix}/etc/xrdp/sesman.ini"], [sesman config file]) +fi AC_CONFIG_FILES([Makefile common/Makefile vnc/Makefile