Changeset 1266

Show
Ignore:
Timestamp:
05/12/07 13:42:09 (1 year ago)
Author:
common
Message:

nepenthes

  • log-prelude, some fixes by Yoann Vandoorselaere from prelude-ids.org/com
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nepenthes/trunk/configure.ac

    r1169 r1266  
    792792        PRELUDE_LDFLAGS=`$LIBPRELUDE_CONFIG --ldflags` 
    793793        PRELUDE_LIBS=`$LIBPRELUDE_CONFIG --libs` 
    794         PRELUDE_CPPFLAGS=`$LIBPRELUDE_CONFIG --cflags` 
     794        PRELUDE_CPPFLAGS=`$LIBPRELUDE_CONFIG --pthread-cflags` 
    795795         
    796796        LIB_PRELUDE="$PRELUDE_LIBS" 
    797797        LDFLAG_PRELUDE="$PRELUDE_LDFLAGS" 
    798         CPPFLAG="$PRELUDE_CPPFLAGS" 
    799          
     798        CPPFLAGS="$CPPFLAGS $PRELUDE_CPPFLAGS" 
    800799    fi 
    801800fi 

  • nepenthes/trunk/modules/log-prelude/Makefile.am

    r718 r1266  
    55AUTOMAKE_OPTIONS = foreign 
    66 
    7 AM_CPPFLAGS = -I/usr/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE $(CPPFLAG_PRELUDE) 
     7AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE 
    88AM_CXXFLAGS = -Wall 
    99AM_LDFLAGS = $(LDFLAG_PRELUDE) ${LIB_PRELUDE} 

  • nepenthes/trunk/modules/log-prelude/log-prelude.cpp

    r550 r1266  
    196196        if ( ret < 0 ) 
    197197                return false; 
    198         prelude_string_set_constant(string, analyzerModel.c_str()); 
     198        prelude_string_set_ref(string, analyzerModel.c_str()); 
    199199         
    200200        ret = idmef_analyzer_new_class(prelude_client_get_analyzer(m_PreludeClient), &string); 
    201201        if ( ret < 0 ) 
    202202                return false; 
    203         prelude_string_set_constant(string, analyzerClass.c_str()); 
     203        prelude_string_set_ref(string, analyzerClass.c_str()); 
    204204         
    205205        ret = idmef_analyzer_new_manufacturer(prelude_client_get_analyzer(m_PreludeClient), &string); 

  • nepenthes/trunk/modules/log-prelude/log-prelude.hpp

    r355 r1266  
    3131 
    3232#ifdef HAVE_LIBPRELUDE 
    33 #include <prelude.h> 
     33#include <libprelude/prelude.h> 
    3434#endif 
    3535