Changeset 181
- Timestamp:
- Sep 23, 2008, 8:41:26 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r180 r181 151 151 $(srcsrc)/sh_prelink.c $(srcsrc)/sh_static.c \ 152 152 $(srcsrc)/sh_portcheck.c $(srcsrc)/sh_port2proc.c\ 153 $(srcsrc)/sh_processcheck.c $(srcsrc)/sh_prelude_old.c\153 $(srcsrc)/sh_processcheck.c \ 154 154 $(srcsrc)/sh_pthread.c $(srcsrc)/sh_string.c \ 155 155 $(srcsrc)/dnmalloc.c \ … … 167 167 zAVLTree.o sh_socket.o sh_ignore.o sh_prelude.o \ 168 168 sh_mounts.o sh_userfiles.o sh_prelink.o sh_static.o \ 169 sh_processcheck.o sh_portcheck.o sh_port2proc.o sh_prelude_old.o\169 sh_processcheck.o sh_portcheck.o sh_port2proc.o \ 170 170 sh_pthread.o sh_string.o dnmalloc.o 171 171 … … 1706 1706 sh_prelink.o: $(srcsrc)/sh_prelink.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_extern.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h 1707 1707 sh_static.o: $(srcsrc)/sh_static.c Makefile config_xor.h $(srcinc)/sh_pthread.h 1708 sh_prelude_old.o: $(srcsrc)/sh_prelude_old.c Makefile config_xor.h $(srcinc)/slib.h $(srcinc)/sh_mem.h $(srcinc)/sh_cat.h $(srcinc)/sh_error_min.h $(srcinc)/sh_prelude.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h1709 1708 sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h 1710 1709 sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_calls.h $(srcinc)/sh_pthread.h $(srcinc)/CuTest.h -
trunk/configure.ac
r177 r181 963 963 case "$sh_libprelude_version" in 964 964 0.8*) 965 sh_prelude_libs=`$LIBPRELUDE_CONFIG --libs | sed 's,\(.*\)\( -L.* -lprelude$\),\2 \1,'` 966 sh_prelude_cflags=`$LIBPRELUDE_CONFIG --cflags` 967 LIBS="$LIBS ${sh_prelude_libs}" 968 CFLAGS="$CFLAGS ${sh_prelude_cflags}" 969 AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude]) 970 AC_DEFINE(HAVE_LIBPRELUDE_8,1,[Have libprelude 0.8]) 965 AC_MSG_ERROR([Libprelude 0.8 is too old, 0.9.6 or higher is required.]) 971 966 ;; 972 967 *) … … 974 969 [ 975 970 AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude]) 976 AC_DEFINE(HAVE_LIBPRELUDE_9,1,[Have libprelude 0.9])977 971 CFLAGS="$CFLAGS $LIBPRELUDE_PTHREAD_CFLAGS" 978 972 LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" -
trunk/docs/Changelog
r180 r181 1 1 2.4.7: 2 * remove libprelude 0.8 support (obsolete) 2 3 * sh_forward.c: increase TIME_OUT_DEF to 900 secs 3 4 * dnmalloc.c: initialize rc in dnmalloc_fork_child(), -
trunk/src/sh_error.c
r170 r181 799 799 void sh_error_fixup(void) 800 800 { 801 #if defined(HAVE_LIBPRELUDE _9)801 #if defined(HAVE_LIBPRELUDE) 802 802 if ((errFlags.preludelevel & SH_ERR_NOT) == 0) 803 803 sh_prelude_init(); … … 815 815 void sh_error_init_prelude(void) 816 816 { 817 #if defined(HAVE_LIBPRELUDE _9)817 #if defined(HAVE_LIBPRELUDE) 818 818 if ((errFlags.preludelevel & SH_ERR_NOT) == 0) 819 819 sh_prelude_init(); -
trunk/src/sh_getopt.c
r171 r181 276 276 HAS_ARG_NO, 277 277 sh_getopt_version }, 278 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)278 #if defined(HAVE_LIBPRELUDE) 279 279 /* need to skip over these */ 280 280 { N_("prelude"), … … 373 373 #ifdef HAVE_LIBPRELUDE 374 374 if (num > 0) fputc ('\n', stdout); ++num; 375 #ifdef HAVE_LIBPRELUDE_8 376 fputs (_(" prelude (0.8)"), stdout); 377 #else 378 fputs (_(" prelude (0.9+)"), stdout); 379 #endif 375 fputs (_(" prelude (0.9.6+)"), stdout); 380 376 #endif 381 377 -
trunk/src/sh_hash.c
r171 r181 2441 2441 * also report device for prelude 2442 2442 */ 2443 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)2443 #if defined(HAVE_LIBPRELUDE) 2444 2444 if (is_new) 2445 2445 format = _("dev_new=\"%lu,%lu\" "); … … 2609 2609 * also report device for prelude 2610 2610 */ 2611 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)2611 #if defined(HAVE_LIBPRELUDE) 2612 2612 if (is_new) 2613 2613 format = _("dev_new=<%lu,%lu>, "); … … 3062 3062 3063 3063 if ( ((modi_mask & MODI_MOD) != 0) 3064 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)3064 #if defined(HAVE_LIBPRELUDE) 3065 3065 || ((modi_mask & MODI_USR) != 0) 3066 3066 || ((modi_mask & MODI_GRP) != 0) … … 3211 3211 * also report device for prelude 3212 3212 */ 3213 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)3213 #if defined(HAVE_LIBPRELUDE) 3214 3214 if ((modi_mask & MODI_INO) != 0) 3215 3215 { … … 3234 3234 3235 3235 if ( ((modi_mask & MODI_USR) != 0) 3236 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)3236 #if defined(HAVE_LIBPRELUDE) 3237 3237 || ((modi_mask & MODI_MOD) != 0) 3238 3238 #endif … … 3262 3262 3263 3263 if ( ((modi_mask & MODI_GRP) != 0) 3264 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)3264 #if defined(HAVE_LIBPRELUDE) 3265 3265 || ((modi_mask & MODI_MOD) != 0) 3266 3266 #endif -
trunk/src/sh_prelude.c
r180 r181 62 62 char ** sh_argv_store; 63 63 64 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)64 #if defined(HAVE_LIBPRELUDE) 65 65 66 66 -
trunk/src/sh_readconf.c
r170 r181 48 48 #endif 49 49 50 #ifdef HAVE_LIBPRELUDE _950 #ifdef HAVE_LIBPRELUDE 51 51 #include "sh_prelude.h" 52 52 #endif … … 1053 1053 { N_("preludeclass"), SH_SECTION_LOG, SH_SECTION_NONE, 1054 1054 sh_error_prelude_mask }, 1055 #ifdef HAVE_LIBPRELUDE_91056 1055 { N_("preludeprofile"), SH_SECTION_MISC, SH_SECTION_NONE, 1057 1056 sh_prelude_set_profile }, … … 1064 1063 { N_("preludemaptohigh"), SH_SECTION_MISC, SH_SECTION_NONE, 1065 1064 sh_prelude_map_high }, 1066 #endif1067 1065 #endif 1068 1066
Note:
See TracChangeset
for help on using the changeset viewer.