at work
This commit is contained in:
49
configure.ac
49
configure.ac
@@ -52,7 +52,6 @@ fi
|
||||
AC_PATH_PROG([CP],[cp cp])
|
||||
AC_PROG_INSTALL
|
||||
AC_CANONICAL_HOST
|
||||
#PKG_CHECK_MODULES([CHECK], [check])
|
||||
|
||||
case $host_os in
|
||||
*freebsd* )
|
||||
@@ -89,39 +88,39 @@ test "x$prefix" == "xNONE" && prefix=$ac_default_prefix
|
||||
PREFIX=$prefix
|
||||
|
||||
dnl --------------------------------------------------------------------------------------
|
||||
AC_ARG_WITH(confdir,
|
||||
AS_HELP_STRING([--with-confdir=PATH],[set configuration dir to PATH (default: "${ac_default_prefix}"/etc/${PACKAGE})]),
|
||||
[ if test ! -z "$with_confdir" ; then
|
||||
case $with_confdir in
|
||||
AC_ARG_WITH(configdir,
|
||||
AS_HELP_STRING([--with-configdir=PATH],[set configuration dir to PATH (default: "${ac_default_prefix}"/etc/${PACKAGE})]),
|
||||
[ if test ! -z "$with_configdir" ; then
|
||||
case $with_configdir in
|
||||
/*)
|
||||
APP_CONFDIR="$with_confdir"
|
||||
APP_CONFIGDIR="$with_configdir"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(You must specify an absolute path to --with-confdir=PATH)
|
||||
AC_MSG_ERROR(You must specify an absolute path to --with-configdir=PATH)
|
||||
;;
|
||||
esac
|
||||
else
|
||||
APP_CONFDIR="$prefix/etc/${PACKAGE}"
|
||||
APP_CONFIGDIR="$prefix/etc/${PACKAGE}"
|
||||
fi ],
|
||||
[
|
||||
APP_CONFDIR="$prefix/etc/${PACKAGE}"
|
||||
APP_CONFIGDIR="$prefix/etc/${PACKAGE}"
|
||||
])
|
||||
|
||||
AS_IF([test "x$enable_devel_mode" = "xyes"], [
|
||||
APP_CONFDIR="${SRCDIR}/"
|
||||
sysconfdir="${SRCDIR}/"
|
||||
APP_CONFIGDIR="${SRCDIR}/"
|
||||
sysconfigdir="${SRCDIR}/"
|
||||
], [
|
||||
test "x$APP_CONFDIR" == "x/usr/etc/${PACKAGE}" && APP_CONFDIR="/etc/${PACKAGE}"
|
||||
test "x$prefix" == "x/usr" && sysconfdir="/etc"
|
||||
test "x$APP_CONFIGDIR" == "x/usr/etc/${PACKAGE}" && APP_CONFIGDIR="/etc/${PACKAGE}"
|
||||
test "x$prefix" == "x/usr" && sysconfigdir="/etc"
|
||||
])
|
||||
|
||||
AC_MSG_NOTICE(app_confdir set as ${APP_CONFDIR})
|
||||
AC_MSG_NOTICE(app_configdir set as ${APP_CONFIGDIR})
|
||||
|
||||
AC_DEFINE_UNQUOTED(APP_CONFDIR, "$APP_CONFDIR", [location of configuration files for ${PACKAGE}])
|
||||
AC_SUBST(APP_CONFDIR, "$APP_CONFDIR")
|
||||
AC_DEFINE_UNQUOTED(APP_CONFIGDIR, "$APP_CONFIGDIR", [location of configuration files for ${PACKAGE}])
|
||||
AC_SUBST(APP_CONFIGDIR, "$APP_CONFIGDIR")
|
||||
|
||||
dnl AC_DEFINE_UNQUOTED(app_confdir, "$APP_CONFDIR", [location of configuration files for ${PACKAGE}])
|
||||
AC_SUBST(app_confdir, "$APP_CONFDIR")
|
||||
dnl AC_DEFINE_UNQUOTED(app_configdir, "$APP_CONFIGDIR", [location of configuration files for ${PACKAGE}])
|
||||
AC_SUBST(app_configdir, "$APP_CONFIGDIR")
|
||||
|
||||
dnl --------------------------------------------------------------------------------------
|
||||
AC_ARG_WITH(logdir,
|
||||
@@ -207,7 +206,7 @@ AC_ARG_WITH(libdir,
|
||||
])
|
||||
|
||||
AS_IF([test "x$enable_devel_mode" = "xyes"], [
|
||||
APP_LIBDIR="${SRCDIR}/"
|
||||
APP_LIBDIR="${SRCDIR}/lib"
|
||||
])
|
||||
|
||||
AC_MSG_NOTICE(app_libdir set as ${APP_LIBDIR})
|
||||
@@ -302,7 +301,7 @@ AC_ARG_WITH(databasedir,
|
||||
APP_DATABASEDIR="$with_databasedir"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(You must specify an absolute path to --with-databasedir=PATH)
|
||||
AC_MSG_ERROR(You must specify an absolute path to --with-databasedir=PATH)
|
||||
;;
|
||||
esac
|
||||
else
|
||||
@@ -360,13 +359,15 @@ AC_SUBST(APP_CACHEDIR, "$APP_CACHEDIR")
|
||||
dnl AC_DEFINE_UNQUOTED(app_cachedir, "$APP_CACHEDIR", [location of cache dir])
|
||||
AC_SUBST(app_cachedir, "$APP_CACHEDIR")
|
||||
|
||||
APP_DAEMONIZE="true"
|
||||
AS_IF([test "x$enable_devel_mode" = "xyes"], [
|
||||
APP_DAEMONIZE="false"
|
||||
])
|
||||
dnl APP_DAEMONIZE="true"
|
||||
dnl AS_IF([test "x$enable_devel_mode" = "xyes"], [
|
||||
dnl APP_DAEMONIZE="false"
|
||||
dnl ])
|
||||
|
||||
dnl AC_SUBST(app_daemonize, "$APP_DAEMONIZE")
|
||||
|
||||
AC_SUBST(app_name, "$PACKAGE")
|
||||
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
|
||||
Reference in New Issue
Block a user