Changes in configure [c6ca3ee:caceb06]
Legend:
- Unmodified
- Added
- Removed
-
configure
rc6ca3ee rcaceb06 156 156 157 157 echo CFLAGS=$CFLAGS >> Makefile.settings 158 echo CFLAGS+=-I`pwd` - iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings158 echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings 159 159 160 160 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings … … 267 267 detect_ldap() 268 268 { 269 TMPFILE= `mktemp`269 TMPFILE=$(mktemp) 270 270 if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then 271 271 cat<<EOF>>Makefile.settings … … 280 280 ret=0 281 281 fi 282 } 283 284 RESOLV_TESTCODE=' 285 #include <arpa/nameser.h> 286 #include <resolv.h> 287 288 int main() 289 { 290 ns_initparse( NULL, 0, NULL ); 291 ns_parserr( NULL, ns_s_an, 0, NULL ); 292 } 293 ' 294 295 detect_resolv_dynamic() 296 { 297 echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null 298 if [ "$?" = "0" ]; then 299 echo 'EFLAGS+=-lresolv' >> Makefile.settings 300 return 0 301 fi 302 303 return 1 304 } 305 306 detect_resolv_static() 307 { 308 for i in $systemlibdirs; do 309 if [ -f $i/libresolv.a ]; then 310 echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null 311 if [ "$?" = "0" ]; then 312 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings 313 return 0 314 fi 315 fi 316 done 317 318 return 1 282 319 } 283 320 … … 323 360 324 361 ## Yes, you, at the console! How can you authenticate if you don't have any SSL!? 325 if [ "$msn" = "1" ]; then362 if [ "$msn" = "1" -o "$yahoo" = "1" ]; then 326 363 echo 327 echo 'Real SSL support is necessary for MSN authentication, will build without' 328 echo 'MSN protocol support.' 364 echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.' 329 365 msn=0 366 yahoo=0 330 367 fi 331 368 … … 349 386 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings 350 387 351 for i in $systemlibdirs; do 352 if [ -f $i/libresolv.a ]; then 353 echo '#define HAVE_RESOLV_A' >> config.h 354 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings 355 break 356 fi 357 done 388 if detect_resolv_dynamic || detect_resolv_static; then 389 echo '#define HAVE_RESOLV_A' >> config.h 390 fi 358 391 359 392 STORAGES="text xml" … … 496 529 ;; 497 530 Darwin ) 531 echo 'STRIP=\# skip strip' >> Makefile.settings 498 532 ;; 499 533 IRIX )
Note: See TracChangeset
for help on using the changeset viewer.