gergely/wmud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix configure.ac and toplevel Makefile.am

Browse Source
This commit is contained in:
Gergely Polonkai 2016-07-04 15:21:42 +02:00
parent 9bded1b722
commit 12a51a2cc5
2 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -1,5 +1,10 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = wmud docs/reference/wmud SUBDIRS = wmud
if ENABLE_GTK_DOC
SUBDIRS += docs/reference/wmud
endif
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
csclean: csclean:

42
configure.ac
View File

@ -18,15 +18,24 @@ if test "$ac_have_crypt" != "yes"; then
exit 1 exit 1
fi fi
AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable debugging support (default: disabled)]), [enable_debug=yes; CFLAGS="$CFLAGS -g -Wall"], [enable_debug=no]) AC_ARG_ENABLE(
[debug],
AS_HELP_STRING(
[--enable-debug],
[Enable debugging support (default: disabled)]),
[enable_debug=yes; CFLAGS="$CFLAGS -g -Wall"],
[enable_debug=no])
AM_CONDITIONAL([ENABLE_DEBUG], [test "$enable_debug" = "yes"]) AM_CONDITIONAL([ENABLE_DEBUG], [test "$enable_debug" = "yes"])
if test "$enable_debug" = "yes"; then if test "$enable_debug" = "yes"; then
AC_DEFINE([DEBUG], [1], [Define to compile with debugging support]) AC_DEFINE([DEBUG], [1], [Define to compile with debugging support])
fi fi
AC_DEFINE([WMUD_TICK_LENGTH], [500], [Length of a game tick, in milliseconds]) AC_DEFINE([WMUD_TICK_LENGTH], [500], [Length of a game tick, in milliseconds])
AC_DEFINE([WMUD_HEARTBEAT_LENGTH], [30], [Length of a heartbeat, in ticks]) AC_DEFINE([WMUD_HEARTBEAT_LENGTH], [30], [Length of a heartbeat, in ticks])
AC_DEFINE([WMUD_MAINTENANCE_TIME], [600], [Time between maintenance runs, in seconds]) AC_DEFINE([WMUD_MAINTENANCE_TIME],
[600],
[Time between maintenance runs, in seconds])
m4_ifdef([GTK_DOC_CHECK], [ m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.14], [--flavour no-tmpl]) GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
@ -34,15 +43,28 @@ GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
AM_CONDITIONAL([ENABLE_GTK_DOC], false) AM_CONDITIONAL([ENABLE_GTK_DOC], false)
]) ])
AC_ARG_ENABLE([memcached], AS_HELP_STRING([--disable-memcached], [Disable Memcached support (default: enabled)]), [], [enable_memcached=yes]) AC_ARG_ENABLE(
[memcached],
AS_HELP_STRING(
[--disable-memcached],
[Disable Memcached support (default: enabled)]),
[],
[enable_memcached=yes])
AM_CONDITIONAL([ENABLE_MEMCACHED], [test "$enable_memcached" = "yes"]) AM_CONDITIONAL([ENABLE_MEMCACHED], [test "$enable_memcached" = "yes"])
if test "$enable_memcached" = "yes"; then if test "$enable_memcached" = "yes"; then
PKG_CHECK_MODULES([MEMCACHED], libmemcached); PKG_CHECK_MODULES([MEMCACHED], libmemcached);
AC_DEFINE([ENABLE_MEMCACHED], [1], [Define to compile with Memcached support]) AC_DEFINE([ENABLE_MEMCACHED],
[1],
[Define to compile with Memcached support])
fi fi
AC_DEFINE([DEFAULT_PORT], [4000], [The default port number if not specified in the config file]) AC_DEFINE([DEFAULT_PORT],
AC_DEFINE([MAX_RECV_LEN], [1024], [The maximum length of the recv() queue in bytes]) [4000],
[The default port number if not specified in the config file])
AC_DEFINE([MAX_RECV_LEN],
[1024],
[The maximum length of the recv() queue in bytes])
PKG_CHECK_MODULES([GIO], gio-2.0) PKG_CHECK_MODULES([GIO], gio-2.0)
PKG_CHECK_MODULES([GLIB], glib-2.0) PKG_CHECK_MODULES([GLIB], glib-2.0)
@ -57,4 +79,10 @@ fi
AM_PATH_GLIB_2_0 AM_PATH_GLIB_2_0
AC_OUTPUT(Makefile wmud/Makefile docs/reference/wmud/Makefile create-world.sh drop-world.sh) AC_OUTPUT(
Makefile
wmud/Makefile
docs/reference/wmud/Makefile
create-world.sh
drop-world.sh
)