version 0.3.18

[fms.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27de288..7cf50e0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,8 +120,12 @@ ENDIF(DO_CHARSET_CONVERSION)
 IF(ALTERNATE_CAPTCHA)\r
        SET(FMS_SRC ${FMS_SRC} \r
        src/freenet/captcha/alternatecaptcha1.cpp\r
+       src/freenet/captcha/alternatecaptcha2.cpp\r
+       src/freenet/captcha/alternatecaptchafonts.cpp\r
        src/freenet/captcha/freeimage/bitmap.cpp\r
        src/freenet/captcha/freeimage/font.cpp)\r
+ELSE(ALTERNATE_CAPTCHA)\r
+       MESSAGE(STATUS "You are using the old captcha generator.  Add a -D ALTERNATE_CAPTCHA=ON to the command line to use the alternate captcha generator.")\r
 ENDIF(ALTERNATE_CAPTCHA)\r
 \r
 IF(NOT I_HAVE_READ_THE_README)\r
@@ -169,7 +173,7 @@ FIND_LIBRARY(ICONV_LIBRARY NAMES iconv iconv_s libiconv libiconv_s)
 IF(ALTERNATE_CAPTCHA)\r
        FIND_FILE(FREEIMAGE_LIBRARY NAMES libfreeimage.a PATHS /usr/lib/)\r
        IF(NOT FREEIMAGE_LIBRARY)\r
-               FIND_LIBRARY(FREEIMAGE_LIBRARY NAMES FreeImage libFreeImage libfreeimage)\r
+               FIND_LIBRARY(FREEIMAGE_LIBRARY NAMES FreeImage libFreeImage libfreeimage freeimage)\r
        ENDIF(NOT FREEIMAGE_LIBRARY)\r
 ENDIF(ALTERNATE_CAPTCHA)\r
 \r