From: Jon Trulson <jon@radscan.com>
Date: Wed, 30 Oct 2019 16:59:22 +0000 (-0600)
Subject: configure: Add -DANSICPP -DMULTIBYTE -DNLS16 to SOURCE_CPP_DEFINES
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=89914f61684e4101699f1b71ee590b3d24e67dda;p=oweals%2Fcde.git

configure: Add -DANSICPP -DMULTIBYTE -DNLS16 to SOURCE_CPP_DEFINES
---

diff --git a/cde/configure.ac b/cde/configure.ac
index a7f52212..97d73b2b 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -2,10 +2,13 @@ AC_INIT([cde-desktop], [2.3.1], [jon@radscan.com])
 AC_CONFIG_HEADERS([include/autotools_config.h])
 AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
+LT_INIT
 AC_PREFIX_DEFAULT(/usr/dt)
 
 AC_ENABLE_STATIC([no])
 
+PKG_PROG_PKG_CONFIG
+
 dnl todo: determine what version of autoconf we depend on
 dnl AC_PREREQ()
 
@@ -21,8 +24,8 @@ AC_SUBST(CDE_VERSION_MAJOR)
 AC_SUBST(CDE_VERSION_MINOR)
 AC_SUBST(CDE_VERSION_MICRO)
 
-dnl SOURCE_DEFINES - needed for some OS's
-SOURCE_CPP_DEFINES=""
+dnl SOURCE_DEFINES - start with CDE project default
+SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16"
 
 dnl CPP_COMPILER_FLAGS - CPP/C/C++ compiler flags
 CPP_COMPILER_FLAGS=""
@@ -60,8 +63,8 @@ case "${host_os}" in
 		build_linux=yes
                 OSMAJORVERSION=4
                 OSMINORVERSION=15
-                SOURCE_CPP_DEFINES="-D_POSIX_SOURCE -D_DEFAULT_SOURCE \
--D_BSD_SOURCE -D_SVID_SOURCE"
+                SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -D_POSIX_SOURCE \
+-D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE"
                 CPP_COMPILER_FLAGS="-fno-strict-aliasing -Wno-write-strings \
 -Wno-unused-result"
                  ;;