X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=7ec087ed26195b4d0ac62e426f89fc25d1347528;hb=660d2e98144ce7ec32867c34c411243688a53094;hp=51ab14d53096000088e1ed6a9e5f7a193ee482b6;hpb=2ef89683a3c968b6f71987988d3416a17855ef2d;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 51ab14d530..7ec087ed26 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -12,24 +12,28 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
+// obligatory flags
+#define QT_NO_STL 1
+#define QT_NO_KEYWORDS 1
+#define HAVE_ICONV 1
+
 #include "configCompiler.h"
 
 #ifdef LYX_ENABLE_PCH
 #include "pcheaders.h"
 #endif
 
-#cmakedefine WORDS_BIGENDIAN 1
-
-#cmakedefine HAVE_ASPELL_ASPELL_H 1
-#cmakedefine HAVE_ASPELL_H 1
 
 #cmakedefine PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
+#define PACKAGE_STRING "LyX ${PACKAGE_VERSION}"
 #cmakedefine PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
 #cmakedefine LYX_DATE "${LYX_DATE}"
 #cmakedefine VERSION_INFO "${VERSION_INFO}"
 #cmakedefine LYX_DIR_VER "${LYX_DIR_VER}"
 #cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}"
+#define LYX_MAJOR_VERSION ${LYX_MAJOR_VERSION}
+#define LYX_MINOR_VERSION ${LYX_MINOR_VERSION}
 
 #define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}"
 #define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}"
@@ -41,5 +45,118 @@
 #cmakedefine USE_MACOSX_PACKAGING 1
 #cmakedefine PATH_MAX ${PATH_MAX}
 
+#cmakedefine WORDS_BIGENDIAN 1
+
+#cmakedefine LYX_MERGE_FILES 1
+
+#cmakedefine LYX_USE_TR1 1
+#cmakedefine LYX_USE_TR1_REGEX 1
+
+#cmakedefine ASPELL_FOUND 1
+#ifdef ASPELL_FOUND
+#define USE_ASPELL 1
+#endif
+
+#cmakedefine AIKSAURUSLIB_FOUND 1
+#ifdef AIKSAURUSLIB_FOUND
+#define HAVE_LIBAIKSAURUS 1
+#define AIKSAURUS_H_LOCATION "${AIKSAURUSLIB_H}"
+#endif
+
+#cmakedefine ENCHANT_FOUND 1
+#ifdef ENCHANT_FOUND
+#define USE_ENCHANT 1
+#endif
+
+#cmakedefine HUNSPELL_FOUND 1
+#ifdef HUNSPELL_FOUND
+#define USE_HUNSPELL 1
+#endif
+
+#cmakedefine LYX_NLS 1
+#ifdef LYX_NLS
+#define ENABLE_NLS 1
+// These are needed when building included gettext (taken from autoconf macro)
+#cmakedefine LYX_EXTERNAL_LIBINTL 1
+#if !defined(LYX_EXTERNAL_LIBINTL)
+// this only makes sense when LYX_EXTERNAL_LIBINTL is OFF.
+#define __libc_lock_t                   gl_lock_t
+#define __libc_lock_define              gl_lock_define
+#define __libc_lock_define_initialized  gl_lock_define_initialized
+#define __libc_lock_init                gl_lock_init
+#define __libc_lock_lock                gl_lock_lock
+#define __libc_lock_unlock              gl_lock_unlock
+#define __libc_lock_recursive_t                   gl_recursive_lock_t
+#define __libc_lock_define_recursive              gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive                gl_recursive_lock_init
+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
+#define glthread_in_use  libintl_thread_in_use
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
+#define glthread_once_singlethreaded  libintl_once_singlethreaded
+#define hash_string			libintl_hash_string
+#endif /* LYX_EXTERNAL_LIBINTL */
+#endif
+
+
+#endif // config.h guard
+
+
 
+// Unguarded cleanup of global namespace:
+
+#ifdef ColorMode
+#undef ColorMode
+#endif
+
+#ifdef FocusOut
+#undef FocusOut
+#endif
+
+#ifdef FocusIn
+#undef FocusIn
+#endif
+
+#ifdef KeyRelease
+#undef KeyRelease
+#endif
+
+#ifdef CursorShape
+#undef CursorShape
+#endif
+
+#ifdef IGNORE
+#undef IGNORE
+#endif
+
+#ifdef GrayScale
+#undef GrayScale
+#endif
+
+#ifdef Status
+#undef Status
 #endif
+
+#ifdef IN
+#undef IN
+#endif
+
+#ifdef KeyPress
+#undef KeyPress
+#endif
+