Mercurial > hg > octave-nkf

comparison configure.in @ 9540:79b5fe2d5646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use Z_LIBS in checks for curl and glpk libraries
author John W. Eaton <jwe@octave.org>
date Tue, 18 Aug 2009 12:10:16 -0400
parents d0239bddf621
children f5ec5dc66824
comparison
equal deleted inserted replaced
9539:41a74dcd14df 9540:79b5fe2d5646
556 FFT_DIR= 556 FFT_DIR=
557 fi 557 fi
558 558
559 # Checks for GLPK header and library. 559 # Checks for GLPK header and library.
560 560
561 save_CPPFLAGS="$CPPFLAGS"
562 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS"
563 save_LIBS="$LIBS"
564 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS"
561 OCTAVE_CHECK_LIBRARY(glpk, GLPK, 565 OCTAVE_CHECK_LIBRARY(glpk, GLPK,
562 [GLPK library not found. The glpk function for solving linear programs will be disabled.], 566 [GLPK library not found. The glpk function for solving linear programs will be disabled.],
563 [glpk/glpk.h glpk.h], [_glp_lpx_simplex]) 567 [glpk/glpk.h glpk.h], [_glp_lpx_simplex])
568 LIBS="$save_LIBS"
569 CPPFLAGS="$save_CPPFLAGS"
564 570
565 # Checks for CURL header and library. 571 # Checks for CURL header and library.
566 572
573 save_CPPFLAGS="$CPPFLAGS"
574 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS"
575 save_LIBS="$LIBS"
576 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS"
567 OCTAVE_CHECK_LIBRARY(curl, cURL, 577 OCTAVE_CHECK_LIBRARY(curl, cURL,
568 [cURL library not found. The urlread and urlwrite functions will be disabled.], 578 [cURL library not found. The urlread and urlwrite functions will be disabled.],
569 [curl/curl.h], [curl_easy_escape]) 579 [curl/curl.h], [curl_easy_escape])
580 LIBS="$save_LIBS"
581 CPPFLAGS="$save_CPPFLAGS"
570 582
571 # GraphicsMagick++ 583 # GraphicsMagick++
572 584
573 warn_magick= 585 warn_magick=
574 AC_CHECK_PROGS(MAGICK_CONFIG, [GraphicsMagick++-config GraphicsMagick-config]) 586 AC_CHECK_PROGS(MAGICK_CONFIG, [GraphicsMagick++-config GraphicsMagick-config])