diff options
124 files changed, 16820 insertions, 4868 deletions
diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake index aeeb9eb27..aefa028b5 100644 --- a/cmake/Anope.cmake +++ b/cmake/Anope.cmake @@ -14,11 +14,15 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS) # Reset libraries set(LIBRARIES) # Check to see if there are any lines matching: /* RequiredLibraries: [something] */ - file(STRINGS ${SRC} REQUIRED_LIBRARIES REGEX "/\\\\*[ \t]*RequiredLibraries:[ \t]*.*[ \t]*\\\\*/") + if(WIN32) + file(STRINGS ${SRC} REQUIRED_LIBRARIES REGEX "/\\\\*[ \t]*RequiredWindowsLibraries:[ \t]*.*[ \t]*\\\\*/") + else(WIN32) + file(STRINGS ${SRC} REQUIRED_LIBRARIES REGEX "/\\\\*[ \t]*RequiredLibraries:[ \t]*.*[ \t]*\\\\*/") + endif(WIN32) # Iterate through those lines foreach(REQUIRED_LIBRARY ${REQUIRED_LIBRARIES}) # Strip off the /* RequiredLibraries: and */ from the line - string(REGEX REPLACE "/\\*[ \t]*RequiredLibraries:[ \t]*([^ \t]*)[ \t]*\\*/" "\\1" REQUIRED_LIBRARY ${REQUIRED_LIBRARY}) + string(REGEX REPLACE "/\\*[ \t]*Required.*Libraries:[ \t]*([^ \t]*)[ \t]*\\*/" "\\1" REQUIRED_LIBRARY ${REQUIRED_LIBRARY}) # Replace all commas with semicolons string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY}) # Iterate through the libraries given diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index e3279a8b8..975294d21 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -2,33 +2,25 @@ if(NOT WIN32) find_path(GETTEXT_INCLUDE libintl.h /usr/include /usr/local/include ${EXTRA_INCLUDE}) find_library(GETTEXT_LIBRARY intl PATHS /usr/lib /usr/lib64 ${EXTRA_LIBS}) - find_library(ICONV_LIBRARY iconv PATHS /usr/lib /usr/lib64 ${EXTRA_LIBS}) find_program(GETTEXT_MSGFMT msgfmt PATHS /usr/bin/ /usr/local/bin ${EXTRA_INCLUDE}) if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT) set(GETTEXT_FOUND TRUE) + if(GETTEXT_LIBRARY) + set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY}) + endif(GETTEXT_LIBRARY) endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT) else(NOT WIN32) - find_path(GETTEXT_INCLUDE libintl.h $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE}) - find_library(GETTEXT_LIBRARY libintl PATHS $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_library(ICONV_LIBRARY libiconv PATHS $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_library(MINGWEX_LIBRARY libmingwex PATHS $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_library(GCC_LIBRARY libgcc PATHS $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_program(GETTEXT_MSGFMT msgfmt PATHS $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE}) - if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY) + find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE}) + find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) + find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE}) + if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT) set(GETTEXT_FOUND TRUE) - endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY) + set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY}) + endif(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT) endif(NOT WIN32) # If we found everything we need set variables correctly for lang/CMakeLists.txt to use if(GETTEXT_FOUND) include_directories("${GETTEXT_INCLUDE}") set(GETTEXT_MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT}) - - if(WIN32) - set(GETTEXT_LIBRARIES libiconv libintl libmingwex libgcc) - else(WIN32) - if(GETTEXT_LIBRARY) - set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY} ${ICONV_LIBRARY}) - endif(GETTEXT_LIBRARY) - endif(WIN32) endif(GETTEXT_FOUND) diff --git a/data/botserv.example.conf b/data/botserv.example.conf index c341eceb3..6cb44afc3 100644 --- a/data/botserv.example.conf +++ b/data/botserv.example.conf @@ -386,6 +386,7 @@ fantasy { name = "LEVELS"; command = "chanserv/levels"; } fantasy { name = "LIST"; command = "chanserv/list"; prepend_channel = false; } fantasy { name = "LOG"; command = "chanserv/log"; } fantasy { name = "MODE"; command = "chanserv/mode"; } +fantasy { name = "MUTE"; command = "chanserv/ban"; kick = no; mode = "QUIET"; } fantasy { name = "OP"; command = "chanserv/modes"; } fantasy { name = "OWNER"; command = |