--- a/add-cmake Wed Jul 18 08:33:34 2012 +0300
+++ b/add-cmake Wed Jul 18 15:08:21 2012 +0300
@@ -1,21 +1,21 @@
# HG changeset patch
-# Parent b2094eba4fa81b84505db4e58f45ca7d2991cc5a
+# Parent 7d80a74d69a007cd16c36664ca64924598394020
[in development] Add possibility to build with CMake
-diff -r b2094eba4fa8 .hgignore
---- a/.hgignore Wed Jul 18 06:12:22 2012 +0300
-+++ b/.hgignore Wed Jul 18 08:14:46 2012 +0300
+diff -r 7d80a74d69a0 .hgignore
+--- a/.hgignore Wed Jul 18 13:45:49 2012 +0300
++++ b/.hgignore Wed Jul 18 15:07:47 2012 +0300
@@ -34,3 +34,5 @@
tags
mcabber/ptodo
mcabber/ppatches
+
+mcabber/build
-diff -r b2094eba4fa8 mcabber/CMakeLists.txt
+diff -r 7d80a74d69a0 mcabber/CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/CMakeLists.txt Wed Jul 18 08:14:46 2012 +0300
-@@ -0,0 +1,221 @@
-+## Copyright 2010 Myhailo Danylenko
++++ b/mcabber/CMakeLists.txt Wed Jul 18 15:07:47 2012 +0300
+@@ -0,0 +1,277 @@
++## Copyright 2010-2012 Myhailo Danylenko
+# This file is part of mcabber.
+#
+# mcabber is free software: you can redistribute it and/or modify
@@ -31,14 +31,14 @@
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
-+cmake_minimum_required(VERSION 2.6)
-+project(mcabber C)
-+set(PROJECT_VERSION "0.10.2-dev")
++cmake_minimum_required ( VERSION 2.6 )
++project ( mcabber C )
++set ( PROJECT_VERSION "0.10.2-dev" )
+
+## User settable options
-+option ( ENABLE_DEBUG "Enable debugging output" OFF )
++option ( ENABLE_DEBUG "Enable debugging output" OFF ) # XXX is it really used?
+option ( USE_SIGWINCH "Compile with SIGWINCH handler" OFF )
-+option ( XEP0022 "Enable obsolete Message Events (XEP-0022)" OFF )
++option ( XEP0022 "Enable obsolete Message Events (XEP-0022)" OFF ) # + XEP0085?
+option ( MODULES_ENABLE "Enable dynamic module loading" ON )
+option ( WANT_LIBIDN "Compile with libidn support" ON )
+option ( WANT_GPGME "Compile with PGP support (libgpgme required)" ON )
@@ -47,9 +47,9 @@
+option ( WANT_ASPELL "Use aspell for spell-checking" OFF )
+option ( ENABLE_HGCSET "Report hg changeset in version string" OFF )
+
-+set ( DATA_DIR "share" CACHE PATH "Path to data files" ) # Will it expand it?
-+set ( PKGLIB_DIR "lib/${PROJECT_NAME}" CACHE PATH "Path to modules" ) # Can as well use GNUInstallDirs cmake module
-+set ( HGCSET "" ) # FIXME, set from hg output
++# FIXME
++set ( DATA_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Path to data files" )
++set ( PKGLIB_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Path to modules" )
+
+set ( MCABBER_BRANCH "experimental" )
+set ( MCABBER_VERSION ${PROJECT_VERSION} )
@@ -57,82 +57,117 @@
+## Check for build dependencies
+find_package(PkgConfig REQUIRED)
+
-+## Glib
-+pkg_check_modules(GLIB REQUIRED glib-2.0>=2.14.0)
-+if (MODULES_ENABLE)
-+ pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
-+endif()
-+
-+## Loudmouth
-+pkg_check_modules(LM REQUIRED loudmouth-1.0>=1.4.2)
-+include(CheckSymbolExists)
-+set(CMAKE_REQUIRED_INCLUDES ${LM_INCLUDE_DIRS})
-+set(CMAKE_REQUIRED_LIBRARIES ${LM_LIBRARIES})
-+set(CMAKE_REQUIRESD_FLAGS ${LM_LDFLAGS} ${LM_CFLAGS})
-+check_symbol_exists(lm_connection_unregister_reply_handler loudmouth/loudmouth.h HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER)
++# Standard includes
++include ( CheckIncludeFiles )
++check_include_files ( "wctype.h" HAVE_WCTYPE_H )
++check_include_files ( "localcharset.h" HAVE_LOCALCHARSET_H )
++# Standard functions
++include ( CheckSymbolExists )
++check_symbol_exists ( arc4random "stdlib.h" HAVE_ARC4RANDOM )
++check_symbol_exists ( iswblank "wctype.h" HAVE_ISWBLANK )
++set ( CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE )
++check_symbol_exists ( strcasestr "string.h" HAVE_STRCASESTR )
++set ( CMAKE_REQUIRED_DEFINITIONS -D_XOPEN_SOURCE )
++check_symbol_exists ( wcwidth "wchar.h" HAVE_WCHAR_H ) # TODO change to HAVE_WCWIDTH (used @utf8.h)
++check_symbol_exists ( timezone "time.h" HAVE_TIMEZONE )
++# Types
++include ( CheckStructHasMember )
++check_struct_has_member ( "struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF )
+
-+## Libidn
-+if(WANT_LIBIDN)
-+ pkg_check_modules(LIBIDN libidn)
-+ if(LIBIDN_FOUND)
-+ set(HAVE_LIBIDN TRUE)
-+ endif()
-+endif()
++# Glib
++pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.14.0 )
++if ( MODULES_ENABLE )
++ pkg_check_modules ( GMODULE REQUIRED gmodule-2.0 )
++endif ()
++
++# Loudmouth
++pkg_check_modules ( LM REQUIRED loudmouth-1.0>=1.4.2 )
++set ( CMAKE_REQUIRED_INCLUDES ${LM_INCLUDE_DIRS} )
++set ( CMAKE_REQUIRED_LIBRARIES ${LM_LIBRARIES} )
++set ( CMAKE_REQUIRESD_FLAGS ${LM_LDFLAGS} ${LM_CFLAGS} )
++check_symbol_exists ( lm_connection_unregister_reply_handler "loudmouth/loudmouth.h" HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER )
+
-+## Ncursesw / Ncurses / Curses
-+pkg_check_modules(NCURSESW ncursesw)
-+if(NCURSESW_FOUND)
-+ pkg_check_modules(PANELW REQUIRED panelw)
-+ set(HAVE_UNICODE TRUE)
++# Libidn
++if ( WANT_LIBIDN )
++ pkg_check_modules ( LIBIDN libidn )
++ if ( LIBIDN_FOUND )
++ set ( HAVE_LIBIDN TRUE )
++ endif ()
++endif ()
++
++# Ncursesw / Ncurses / Curses
++pkg_check_modules ( CURSES ncursesw )
++if ( CURSES_FOUND )
++ pkg_check_modules ( PANEL REQUIRED panelw )
++ set ( HAVE_UNICODE TRUE )
+else()
-+ pkg_check_modules(NCURSES ncurses)
-+ if(NCURSES_FOUND)
-+ pkg_check_modules(PANEL REQUIRED panel)
-+ set(HAVE_UNICODE FALSE)
-+ else()
-+ find_package(Curses)
-+ # FIXME
-+ endif()
-+endif()
-+# we do not use curses, and we check for waddnwstr in both libs to determine HAVE_UNICODE
-+# check for ESCDELAY by just linking HAVE_ESCDELAY
++ pkg_check_modules ( CURSES ncurses )
++ if ( CURSES_FOUND )
++ pkg_check_modules ( PANEL REQUIRED panel )
++ set ( HAVE_UNICODE FALSE )
++ else ()
++ find_package ( Curses )
++ # XXX just fail?
++ endif ()
++endif ()
++set ( CMAKE_REQUIRED_INCLUDES ${CURSES_INCLUDE_DIRS} )
++set ( CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARIES} )
++set ( CMAKE_REQUIRED_FLAGS ${CURSES_LDFLAGS} ${CURSES_CFLAGS} )
++check_symbol_exists ( ESCDELAY "curses.h" HAVE_ESCDELAY )
+
-+if(WANT_GPGME)
-+# provides own gpgme-config O_o
-+ set(HAVE_GPGME TRUE)
-+endif()
++# Gpgme
++if ( WANT_GPGME )
++ find_program ( GPGME_CONFIG_EXECUTABLE gpgme-config DOC "Path to gpgme-config executable" )
++ if ( GPGME_CONFIG_EXECUTABLE )
++ execute_process ( COMMAND ${GPGME_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE GPGME_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE )
++ execute_process ( COMMAND ${GPGME_CONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE GPGME_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE )
++ set ( HAVE_GPGME TRUE )
++ endif ()
++endif ()
+
-+if(WANT_OTR)
-+# gcrypt provides own libgcrypt-config O_o
-+# libotr have nothing :(
-+ set(OTR TRUE)
-+endif()
++# Libotr
++if ( WANT_OTR )
++ pkg_check_modules ( LIBOTR libotr )
++ if ( LIBOTR_FOUND )
++ set ( HAVE_LIBOTR TRUE )
++ endif ()
++endif ()
+
-+if(WANT_ENCHANT)
-+ pkg_check_modules(ENCHANT enchant)
-+ if(ENCHANT_FOUND)
-+ set(WITH_ENCHANT TRUE)
-+ endif()
-+elseif(WANT_ASPELL)
-+ find_package(ASPELL)
-+ if(ASPELL_FOUND)
-+ set(WITH_ASPELL TRUE)
-+ endif()
-+# aspell_{include_dir,libraries,definitions}
-+endif()
++# Spellcheckers
++if ( WANT_ENCHANT )
++ pkg_check_modules ( ENCHANT enchant )
++ if ( ENCHANT_FOUND )
++ set ( WITH_ENCHANT TRUE )
++ endif ()
++elseif ( WANT_ASPELL )
++ find_package ( ASPELL )
++ if ( ASPELL_FOUND )
++ set ( WITH_ASPELL TRUE )
++ endif ()
++endif ()
+
-+#include(CheckIncludeFile)
-+#set(CMAKE_REQUIRED_INCLUDES ${MCABBER_INCLUDE_DIRS})
-+#check_include_file(mcabber/disco.h HAVE_MCABBER_DISCO_H)
-+# message(SEND_ERROR "Disco module headers not found")
++# LaTeX for guide
++find_package ( LATEX )
++if ( PDFLATEX_COMPILER AND BIBTEX_COMPILER )
++ set ( HAVE_LATEX TRUE )
++endif ()
+
-+link_directories(${GLIB_LIBRARY_DIRS}
-+ ${GMODULE_LIBRARY_DIRS}
-+ ${LM_LIBRARY_DIRS}
-+ ${LIBIDN_LIBRARY_DIRS}
-+ ${ENCHANT_LIBRARY_DIRS}
-+ ${NCURSESW_LIBRARY_DIRS}
-+ ${NCURSES_LIBRARY_DIRS})
++## HG Changeset
++if ( ENABLE_HGCSET )
++ find_program ( HG_EXECUTABLE hg DOC "Path to hg (mercurial) to request changeset information" )
++ if ( HG_EXECUTABLE )
++ execute_process ( COMMAND hg identify --id OUTPUT_VARIABLE HGCSET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET )
++ endif ()
++endif ()
++
++link_directories ( ${GLIB_LIBRARY_DIRS}
++ ${GMODULE_LIBRARY_DIRS}
++ ${LM_LIBRARY_DIRS}
++ ${LIBIDN_LIBRARY_DIRS}
++ ${ENCHANT_LIBRARY_DIRS}
++ ${CURSES_LIBRARY_DIRS}
++ ${PANEL_LIBRARY_DIRS}
++ ${LIBOTR_LIBRARY_DIRS} )
+
+## Define targets
+set ( mcabber_SUBSYSTEMS
@@ -147,61 +182,81 @@
+ mcabber/main.c
+ mcabber/logprint.h
+ mcabber/xmpp_defines.h
-+ ${mcabber_BINARY_DIR}/include/mcabber/config.h )
-+if ( ENABLE_HGCSET )
-+ list ( APPEND mcabber_SOURCES ${mcabber_BINARY_DIR}/hgcset.h )
-+endif ()
++ ${mcabber_BINARY_DIR}/include/mcabber/config.h
++ ${mcabber_BINARY_DIR}/include/mcabber/hgcset.h )
+foreach ( PART IN LISTS mcabber_SUBSYSTEMS )
+ list ( APPEND mcabber_SOURCES mcabber/${PART}.c mcabber/${PART}.h )
+endforeach ()
+add_executable ( mcabber ${mcabber_SOURCES} )
+
-+if(MODULES_ENABLE)
-+ add_library(beep MODULE modules/beep/beep.c)
-+ add_library(eventcmd MODULE modules/eventcmd/eventcmd.c mcabber/extcmd.c)
-+ add_library(fifo MODULE modules/fifo/fifo_module.c mcabber/fifo.c)
-+ add_library(urlregex MODULE modules/urlregex/urlregex.c)
-+ add_library(xttitle MODULE modules/xttitle/xttitle.c)
-+endif()
++if ( MODULES_ENABLE )
++ add_library ( beep MODULE modules/beep/beep.c )
++ add_library ( eventcmd MODULE modules/eventcmd/eventcmd.c mcabber/extcmd.c )
++ add_library ( fifo MODULE modules/fifo/fifo_module.c mcabber/fifo.c )
++ add_library ( urlregex MODULE modules/urlregex/urlregex.c )
++ add_library ( xttitle MODULE modules/xttitle/xttitle.c )
++endif ()
+
+## Compiler setup
-+configure_file(config.h.in include/mcabber/config.h)
-+include_directories(SYSTEM ${GLIB_INCLUDE_DIRS}
-+ ${GMODULE_INCLUDE_DIRS}
-+ ${LM_INCLUDE_DIRS}
-+ ${LIBIDN_INCLUDE_DIRS}
-+ ${ENCHANT_INCLUDE_DIRS}
-+ ${NCURSESW_INCLUDE_DIRS}
-+ ${NCURSES_INCLUDE_DIRS})
-+target_link_libraries(mcabber ${GLIB_LIBRARIES}
-+ ${GMODULE_LIBRARIES}
-+ ${LM_LIBRARIES}
-+ ${LIBIDN_LIBRARIES}
-+ ${ENCHANT_LIBRARIES}
-+ ${NCURSESW_LIBRARIES}
-+ ${NCURSES_LIBRARIES})
-+include_directories( ${mcabber_SOURCE_DIR}
-+ ${mcabber_BINARY_DIR}/include
-+ ${mcabber_BINARY_DIR}/include/mcabber )
-+# PREFIX "" # for module libraries
-+set_target_properties(mcabber PROPERTIES
-+ COMPILE_FLAGS "-Wall")
++configure_file ( config.h.in include/mcabber/config.h )
++configure_file ( hgcset.h.in include/mcabber/hgcset.h ) # TODO: eliminate
++include_directories ( SYSTEM
++ ${GLIB_INCLUDE_DIRS}
++ ${GMODULE_INCLUDE_DIRS}
++ ${LM_INCLUDE_DIRS}
++ ${LIBIDN_INCLUDE_DIRS}
++ ${ENCHANT_INCLUDE_DIRS}
++ ${ASPELL_INCLUDE_DIR}
++ ${CURSES_INCLUDE_DIRS}
++ ${PANEL_INCLUDE_DIRS}
++ ${LIBOTR_INCLUDE_DIRS} )
++target_link_libraries ( mcabber
++ ${GLIB_LIBRARIES}
++ ${GMODULE_LIBRARIES}
++ ${LM_LIBRARIES}
++ ${LIBIDN_LIBRARIES}
++ ${ENCHANT_LIBRARIES}
++ ${ASPELL_LIBRARIES}
++ ${CURSES_LIBRARIES}
++ ${PANEL_LIBRARIES}
++ ${GPGME_LIBRARIES}
++ ${LIBOTR_LIBRARIES} )
++include_directories ( ${mcabber_SOURCE_DIR}
++ ${mcabber_BINARY_DIR}/include
++ ${mcabber_BINARY_DIR}/include/mcabber )
++set_target_properties ( mcabber PROPERTIES
++ COMPILE_FLAGS "-Wall ${GPGME_CFLAGS} -D_GNU_SOURCE" )
+
+## Extra targets
-+# add_custom_command(OUTPUT ${mcabber_BINARY_DIR}/mcabber.html COMMAND ${mcabber_SOURCE_DIR}/docgen.pl ${mcabber_SOURCES} > ${mcabber_BINARY_DIR}/mcabber.html DEPENDS ${mcabber_SOURCE_DIR}/docgen.pl ${mcabber_SOURCES} WORKING_DIRECTORY ${mcabber_SOURCE_DIR})
-+# add_custom_target(doc ALL DEPENDS ${mcabber_BINARY_DIR}/mcabber.html)
-+# add_custom_target(test COMMAND env "LUA_PATH=${mcabber_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${mcabber_SOURCE_DIR}/?.so;${mcabber_BINARY_DIR}/?.so;${LUA_CPATH}" lua ${mcabber_SOURCE_DIR}/test.lua DEPENDS mcabber VERBATIM)
++if ( HAVE_LATEX )
++ add_custom_command ( OUTPUT guide.aux
++ COMMAND ${PDFLATEX_COMPILER} -output-directory=${mcabber_BINARY_DIR} guide >/dev/null
++ DEPENDS doc/guide/guide.png doc/guide/guide.tex
++ WORKING_DIRECTORY ${mcabber_SOURCE_DIR}/doc/guide )
++ add_custom_command ( OUTPUT guide.bbl
++ COMMAND BIBINPUTS=${mcabber_SOURCE_DIR}/doc/guide ${BIBTEX_COMPILER} guide >/dev/null
++ DEPENDS guide.aux doc/guide/guide.bib
++ WORKING_DIRECTORY ${mcabber_BINARY_DIR} )
++ add_custom_command ( OUTPUT guide.pdf
++ COMMAND ${PDFLATEX_COMPILER} -output-directory=${mcabber_BINARY_DIR} guide >/dev/null
++ DEPENDS guide.bbl guide.aux doc/guide/guide.png doc/guide/guide.tex
++ WORKING_DIRECTORY ${mcabber_SOURCE_DIR}/doc/guide )
++ add_custom_target ( guide ALL ${PDFLATEX_COMPILER} -output-directory=${mcabber_BINARY_DIR} guide >/dev/null
++ DEPENDS guide.pdf
++ WORKING_DIRECTORY ${mcabber_SOURCE_DIR}/doc/guide
++ SOURCES doc/guide/guide.bib doc/guide/guide.png doc/guide/guide.tex )
++endif ()
+
+## Packaging information
-+set(CPACK_PACKAGE_NAME liblua5.1-mcabber) # XXX
++set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-+set(CPACK_PACKAGE_VENDOR "McKael")
++set(CPACK_PACKAGE_VENDOR "McKael")
+set(CPACK_PACKAGE_CONTACT "Mikael BERTHE <mikael@lilotux.net>")
-+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "small Jabber (XMPP) console client")
++set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Small Jabber (XMPP) console client")
+set(CPACK_PACKAGE_DESCRIPTION_FILE ${mcabber_SOURCE_DIR}/README)
-+set(CPACK_RESOURCE_FILE_LICENSE ${mcabber_SOURCE_DIR}/COPYING)
-+set(CPACK_RESOURCE_FILE_README ${mcabber_SOURCE_DIR}/README)
-+set(CPACK_RESOURCE_FILE_WELCOME ${mcabber_SOURCE_DIR}/README)
++set(CPACK_RESOURCE_FILE_LICENSE ${mcabber_SOURCE_DIR}/COPYING)
++set(CPACK_RESOURCE_FILE_README ${mcabber_SOURCE_DIR}/README)
++set(CPACK_RESOURCE_FILE_WELCOME ${mcabber_SOURCE_DIR}/README)
+set(CPACK_SOURCE_GENERATOR TBZ2)
+set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
+set(CPACK_DEBIAN_PACKAGE_SECTION libs)
@@ -219,35 +274,34 @@
+include(CPack)
+
+## Set up installer
-+install(TARGETS mcabber DESTINATION bin)
-+if(MODULES_ENABLE)
-+ install(FILES mcabber/*.h DESTINATION include/mcabber) # FIXME
-+ install(TARGETS beep eventcmd fifo urlregex xttitle DESTINATION lib/mcabber)
-+ install(FILES mcabber.pc DESTINATION lib/pkgconfig) # XXX should we install it into share?
-+endif()
-+install(DIRECTORY doc/help/cs doc/help/de doc/help/en doc/help/fr doc/help/it doc/help/nl doc/help/pl doc/help/ru doc/help/uk DESTINATION share/mcabber/help)
-+install(FILES mcabberrc.example DESTINATION share/doc/${CPACK_PACKAGE_NAME}/examples)
-+install(FILES AUTHORS README TODO ChangeLog.api doc/HOWTO_modules.txt doc/README_PGP.txt DESTINATION share/doc/${CPACK_PACKAGE_NAME})
-+install(FILES doc/mcabber.1.html doc/manpage.css DESTINATION share/doc/${CPACK_PACKAGE_NAME}/html)
-+# guide
-+install(FILES ChangeLog DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME changelog)
-+install(FILES COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME copyright)
-+install(FILES doc/mcabber.1 DESTINATION share/man/man1)
++install ( TARGETS mcabber DESTINATION bin )
++if ( MODULES_ENABLE )
++ install ( DIRECTORY mcabber/ ${mcabber_BINARY_DIR}/include/mcabber/ DESTINATION include/mcabber FILES_MATCHING PATTERN "*.h" PATTERN ".*" EXCLUDE )
++ install ( TARGETS beep eventcmd fifo urlregex xttitle DESTINATION lib/mcabber )
++ install ( FILES mcabber.pc DESTINATION lib/pkgconfig )
++endif ()
++install ( DIRECTORY doc/help DESTINATION share/mcabber FILES_MATCHING PATTERN "*.txt" )
++install ( FILES mcabberrc.example DESTINATION share/doc/${CPACK_PACKAGE_NAME}/examples )
++install ( FILES AUTHORS README TODO ChangeLog.api doc/HOWTO_modules.txt doc/README_PGP.txt DESTINATION share/doc/${CPACK_PACKAGE_NAME} )
++install ( FILES doc/mcabber.1.html doc/manpage.css DESTINATION share/doc/${CPACK_PACKAGE_NAME}/html )
++if ( HAVE_LATEX )
++ install ( FILES ${mcabber_BINARY_DIR}/guide.pdf DESTINATION share/doc/${CPACK_PACKAGE_NAME} ) # :/
++endif ()
++install ( FILES ChangeLog DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME changelog )
++install ( FILES COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME copyright )
++install ( FILES doc/mcabber.1 DESTINATION share/man/man1 )
+
+## The End ## vim: se ts=4 sw=4: ##
-+
-diff -r b2094eba4fa8 mcabber/config.h.in
+diff -r 7d80a74d69a0 mcabber/config.h.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/config.h.in Wed Jul 18 08:14:46 2012 +0300
-@@ -0,0 +1,51 @@
++++ b/mcabber/config.h.in Wed Jul 18 15:07:47 2012 +0300
+@@ -0,0 +1,49 @@
+/* help @help.c */
+#define DATA_DIR "@DATA_DIR@"
+/* conditional @main.c */ /* does it have any effect really? */
+#cmakedefine ENABLE_DEBUG @ENABLE_DEBUG@
+/* conditional @main.c */
+#cmakedefine ENABLE_HGCSET @ENABLE_HGCSET@
-+/* actual version data */
-+#define HGCSET "@HGCSET@"
+/* @xmpp.c */
+#cmakedefine HAVE_ARC4RANDOM @HAVE_ARC4RANDOM@
+/* @screen.c */
@@ -291,9 +345,9 @@
+/* option, also XEP0085? */
+#cmakedefine XEP0022 @XEP0022@
+/* end */
-diff -r b2094eba4fa8 mcabber/configure.ac
---- a/mcabber/configure.ac Wed Jul 18 06:12:22 2012 +0300
-+++ b/mcabber/configure.ac Wed Jul 18 08:14:46 2012 +0300
+diff -r 7d80a74d69a0 mcabber/configure.ac
+--- a/mcabber/configure.ac Wed Jul 18 13:45:49 2012 +0300
++++ b/mcabber/configure.ac Wed Jul 18 15:07:47 2012 +0300
@@ -36,9 +36,8 @@
# Checks for header files.
@@ -319,3 +373,10 @@
AC_CHECK_DECLS([strptime],,,
+diff -r 7d80a74d69a0 mcabber/hgcset.h.in
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/mcabber/hgcset.h.in Wed Jul 18 15:07:47 2012 +0300
+@@ -0,0 +1,3 @@
++/* this can go to config.h */
++#define HGCSET "@HGCSET@"
++/* end */