Changeset 37668
- Timestamp:
- Mar 9, 2017, 3:21:01 PM (7 years ago)
- Location:
- trunk/gdal
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gdal/configure
r37357 r37668 25267 25267 25268 25268 FGDB_ENABLED=no 25269 FGDB_LIB= 25269 25270 25270 25271 if test "$with_fgdb" = "no" ; then … … 25324 25325 as_fn_error $? "not found." "$LINENO" 5 25325 25326 fi 25327 25328 fi 25329 25330 if test "$FGDB_LIB" != ""; then 25331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_datums in -lFileGDBAPI" >&5 25332 $as_echo_n "checking for pj_datums in -lFileGDBAPI... " >&6; } 25333 if ${ac_cv_lib_FileGDBAPI_pj_datums+:} false; then : 25334 $as_echo_n "(cached) " >&6 25335 else 25336 ac_check_lib_save_LIBS=$LIBS 25337 LIBS="-lFileGDBAPI $FGDB_LIB $LIBS" 25338 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 25339 /* end confdefs.h. */ 25340 25341 /* Override any GCC internal prototype to avoid an error. 25342 Use char because int might match the return type of a GCC 25343 builtin and then its argument prototype would still apply. */ 25344 #ifdef __cplusplus 25345 extern "C" 25346 #endif 25347 char pj_datums (); 25348 int 25349 main () 25350 { 25351 return pj_datums (); 25352 ; 25353 return 0; 25354 } 25355 _ACEOF 25356 if ac_fn_c_try_link "$LINENO"; then : 25357 ac_cv_lib_FileGDBAPI_pj_datums=yes 25358 else 25359 ac_cv_lib_FileGDBAPI_pj_datums=no 25360 fi 25361 rm -f core conftest.err conftest.$ac_objext \ 25362 conftest$ac_exeext conftest.$ac_ext 25363 LIBS=$ac_check_lib_save_LIBS 25364 fi 25365 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_FileGDBAPI_pj_datums" >&5 25366 $as_echo "$ac_cv_lib_FileGDBAPI_pj_datums" >&6; } 25367 if test "x$ac_cv_lib_FileGDBAPI_pj_datums" = xyes; then : 25368 FGDB_HAS_PROJ4=yes 25369 else 25370 FGDB_HAS_PROJ4=no 25371 fi 25326 25372 25327 25373 fi … … 36588 36634 $as_echo "$as_me: WARNING: --with-libxml2 and --with-fgdb are both available. There might be some incompatibility between system libxml2 and the embedded copy within libFileGDBAPI" >&2;} 36589 36635 fi 36636 36637 if test "$PROJ_STATIC" = "no" -a "$FGDB_ENABLED" = "yes" -a "$FGDB_HAS_PROJ4" = "yes"; then 36638 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --without-static-proj and --with-fgdb are both available. There might be some incompatibility between system libproj and the embedded copy within libFileGDBAPI" >&5 36639 $as_echo "$as_me: WARNING: --without-static-proj and --with-fgdb are both available. There might be some incompatibility between system libproj and the embedded copy within libFileGDBAPI" >&2;} 36640 fi -
trunk/gdal/configure.in
r37357 r37668 2572 2572 2573 2573 FGDB_ENABLED=no 2574 FGDB_LIB= 2574 2575 2575 2576 if test "$with_fgdb" = "no" ; then … … 2622 2623 fi 2623 2624 2625 fi 2626 2627 if test "$FGDB_LIB" != ""; then 2628 dnl pj_datums is not a function but an object, but for linking that doesn't matter. 2629 AC_CHECK_LIB(FileGDBAPI,pj_datums,FGDB_HAS_PROJ4=yes,FGDB_HAS_PROJ4=no,$FGDB_LIB) 2624 2630 fi 2625 2631 … … 5491 5497 AC_MSG_WARN([--with-libxml2 and --with-fgdb are both available. There might be some incompatibility between system libxml2 and the embedded copy within libFileGDBAPI]) 5492 5498 fi 5499 5500 dnl FileGDB v1.5 5501 if test "$PROJ_STATIC" = "no" -a "$FGDB_ENABLED" = "yes" -a "$FGDB_HAS_PROJ4" = "yes"; then 5502 AC_MSG_WARN([--without-static-proj and --with-fgdb are both available. There might be some incompatibility between system libproj and the embedded copy within libFileGDBAPI]) 5503 fi
Note:
See TracChangeset
for help on using the changeset viewer.