Changes in / [5be87b2:69aaf14]
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
bitlbee.h
r5be87b2 r69aaf14 95 95 #define g_main_quit __PLEASE_USE_B_MAIN_QUIT__ 96 96 97 #ifndef F_OK98 #define F_OK 099 #endif100 101 97 #ifndef G_GNUC_MALLOC 102 98 /* Doesn't exist in GLib <=2.4 while everything else in BitlBee should -
configure
r5be87b2 r69aaf14 74 74 --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) 75 75 $ssl 76 77 --target=... Cross compilation target same as host 76 78 EOF 77 79 exit; … … 132 134 EOF 133 135 136 if [ -n "$target" ]; then 137 PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig 138 PATH=/usr/$target/bin:$PATH 139 CC=$target-cc 140 LD=$target-ld 141 fi 142 134 143 if [ "$debug" = "1" ]; then 135 144 [ -z "$CFLAGS" ] && CFLAGS=-g … … 158 167 echo "CC=$CC" >> Makefile.settings; 159 168 160 if [ -n "$LD" ]; then 161 echo "LD=$LD" >> Makefile.settings; 162 elif type ld > /dev/null 2> /dev/null; then 163 echo "LD=ld" >> Makefile.settings; 164 else 165 echo 'Cannot find ld, aborting.' 166 exit 1; 167 fi 169 if [ -z "$LD" ]; then 170 if type ld > /dev/null 2> /dev/null; then 171 LD=ld 172 else 173 echo 'Cannot find ld, aborting.' 174 exit 1; 175 fi 176 fi 177 178 echo "LD=$LD" >> Makefile.settings 168 179 169 180 if [ -z "$PKG_CONFIG" ]; then … … 213 224 detect_gnutls() 214 225 { 215 if libgnutls-config --version > /dev/null 2> /dev/null; then 226 if $PKG_CONFIG --exists gnutls; then 227 cat <<EOF>>Makefile.settings 228 EFLAGS+=`$PKG_CONFIG --libs gnutls` 229 CFLAGS+=`$PKG_CONFIG --cflags gnutls` 230 EOF 231 ssl=gnutls 232 ret=1 233 elif libgnutls-config --version > /dev/null 2> /dev/null; then 216 234 cat <<EOF>>Makefile.settings 217 235 EFLAGS+=`libgnutls-config --libs` … … 489 507 esac 490 508 509 if [ -n "$target" ]; then 510 echo "Cross-compiling for: $target" 511 fi 512 491 513 echo 492 514 echo 'Configuration done:' -
storage_xml.c
r5be87b2 r69aaf14 29 29 #include "arc.h" 30 30 #include "md5.h" 31 #include <glib/gstdio.h> 31 32 32 33 typedef enum … … 243 244 static void xml_init( void ) 244 245 { 245 if( access( global.conf->configdir, F_OK ) != 0)246 if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) ) 246 247 log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir ); 247 else if( access( global.conf->configdir, R_OK ) != 0 ||access( global.conf->configdir, W_OK ) != 0 )248 else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 ) 248 249 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir ); 249 250 } … … 372 373 g_free( path2 ); 373 374 374 if( !overwrite && access( path, F_OK ) != -1)375 if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) ) 375 376 return STORAGE_ALREADY_EXISTS; 376 377
Note: See TracChangeset
for help on using the changeset viewer.