diff options
| author | Toni Uhlig <Toni.Uhlig@tq-group.com> | 2017-12-04 15:00:41 +0100 |
|---|---|---|
| committer | Toni Uhlig <Toni.Uhlig@tq-group.com> | 2017-12-04 15:00:41 +0100 |
| commit | 08b901edc549f46b96da8847bb8c7e3847f42fc2 (patch) | |
| tree | 6e500453279bbcf3b3dfbb7c345df88dc00019f6 | |
| parent | 581fc4ee46f6da3a92ff15a42333f236fdde13e3 (diff) | |
autoconf/automake optimizations
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index bb89415..9d607fd 100644 --- a/configure.ac +++ b/configure.ac @@ -31,12 +31,6 @@ AC_CHECK_FUNCS([malloc calloc realloc free memcmp memchr memcpy memmove memset p [AC_MSG_ERROR([Missing essential std functions.])]) AX_CXX_COMPILE_STDCXX_11(, [mandatory]) -utool_major_version_number=1 -utool_minor_version_number=0 -utool_release_number=0 -UTOOL_RELEASE=${utool_major_version_number}.${utool_minor_version_number} -UTOOL_VERSION=${UTOOL_RELEASE}.${utool_release_number} - AC_ARG_ENABLE([gui], [AS_HELP_STRING([--disable-gui], [Build the UpdateTool with a wxWidgets based GUI instead of a simple CLI (default enabled).])],,[ut_buildgui=yes]) ut_buildgui=$(echo ${ut_buildgui}) @@ -90,7 +84,7 @@ case "${host}" in *-*-cygwin* | *-*-mingw32* ) AC_CHECK_TOOL(WINDRES, [windres]) PROGRAM_EXT=".exe" - windres="${host_alias}-windres" + windres="${WINDRES:-}" ut_use_msw=yes ut_cflags="${ut_cflags} -D_UNICODE=1 -municode" ut_libs="${ut_libs} -static -lws2_32 -dynamic" diff --git a/src/Makefile.am b/src/Makefile.am index d984a1a..9e70711 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ utool_SOURCES = \ Json.cpp \ UpdateFactory.cpp \ UpdateTool.cpp + if UT_BUILDGUI utool_SOURCES += \ UpdateGUI.cpp \ |