comparison: test/configure
test/configure
- changeset 68
- c997c0978665
- parent 67
- e43d30273f74
- child 71
- b8d06f7b617c
equal
deleted
inserted
replaced
| 67:e43d30273f74 | 68:c997c0978665 |
|---|---|
| 320 done | 320 done |
| 321 | 321 |
| 322 # dependency libxml2 | 322 # dependency libxml2 |
| 323 while true | 323 while true |
| 324 do | 324 do |
| 325 if [ -z "$lang_c" ] ; then | |
| 326 break | |
| 327 fi | |
| 328 if [ -z "$PKG_CONFIG" ]; then | 325 if [ -z "$PKG_CONFIG" ]; then |
| 329 break | 326 break |
| 330 fi | 327 fi |
| 331 if test_pkg_config "libxml-2.0" "" "" "" ; then | 328 if test_pkg_config "libxml-2.0" "" "" "" ; then |
| 332 TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`" | 329 TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`" |
| 401 fi | 398 fi |
| 402 if dependency_error_openssl; then | 399 if dependency_error_openssl; then |
| 403 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl " | 400 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl " |
| 404 ERROR=1 | 401 ERROR=1 |
| 405 fi | 402 fi |
| 406 if dependency_error_libpq; then | |
| 407 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq " | |
| 408 ERROR=1 | |
| 409 fi | |
| 410 | 403 |
| 411 # Features | 404 # Features |
| 412 if [ -n "$FEATURE_PG" ]; then | 405 if [ -n "$FEATURE_PG" ]; then |
| 413 # check dependency | 406 # check dependency |
| 414 if dependency_error_libpq ; then | 407 if dependency_error_libpq ; then |
| 415 # "auto" features can fail and are just disabled in this case | 408 # "auto" features can fail and are just disabled in this case |
| 416 if [ "$FEATURE_PG" = "auto" ]; then | 409 if [ "$FEATURE_PG" = "auto" ]; then |
| 417 unset FEATURE_PG | 410 DISABLE_FEATURE_PG=1 |
| 418 else | 411 else |
| 419 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq " | 412 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq " |
| 420 ERROR=1 | 413 ERROR=1 |
| 421 fi | 414 fi |
| 422 fi | 415 fi |
| 423 # check dependency | 416 # check dependency |
| 424 if dependency_error_cpp ; then | 417 if dependency_error_cpp ; then |
| 425 # "auto" features can fail and are just disabled in this case | 418 # "auto" features can fail and are just disabled in this case |
| 426 if [ "$FEATURE_PG" = "auto" ]; then | 419 if [ "$FEATURE_PG" = "auto" ]; then |
| 427 unset FEATURE_PG | 420 DISABLE_FEATURE_PG=1 |
| 428 else | 421 else |
| 429 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED cpp " | 422 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED cpp " |
| 430 ERROR=1 | 423 ERROR=1 |
| 431 fi | 424 fi |
| 425 fi | |
| 426 if [ -n "$DISABLE_FEATURE_PG" ]; then | |
| 427 unset FEATURE_PG | |
| 432 fi | 428 fi |
| 433 fi | 429 fi |
| 434 | 430 |
| 435 | 431 |
| 436 if [ -n "${TEMP_CFLAGS}" ]; then | 432 if [ -n "${TEMP_CFLAGS}" ]; then |
