source: trunk/dports/science/grads2/files/patch-configure.diff @ 75670

Last change on this file since 75670 was 75670, checked in by takeshi@…, 7 years ago

grads2: commit the forgotten patch. removed unnecessary lines in Portfile

File size: 6.0 KB
  • configure

    old new  
    93159315      readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_name}"
    93169316  done
    93179317
    9318 
    9319   ga_lib_prefix='$(supp_lib_dir)/lib'
    9320   ga_lib_suffix='.a'
    9321   for ga_lib_name in readline ; do
    9322       readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    9323   done
    9324 
     9318  readline_inc=""
     9319  readline_libs=-lreadline
    93259320
    93269321else
    93279322   { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
     
    93949389      readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_name}"
    93959390  done
    93969391
    9397 
    9398   ga_lib_prefix='$(supp_lib_dir)/lib'
    9399   ga_lib_suffix='.a'
    9400   for ga_lib_name in readline ncurses ; do
    9401       readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    9402   done
    9403 
     9392  readline_inc=""
     9393  readline_libs=-lreadline
    94049394
    94059395else
    94069396   { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
     
    94739463      readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_name}"
    94749464  done
    94759465
    9476 
    9477   ga_lib_prefix='$(supp_lib_dir)/lib'
    9478   ga_lib_suffix='.a'
    9479   for ga_lib_name in readline ; do
    9480       readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    9481   done
    9482 
    9483               readline_libadd=" -ltermcap"
     9466  readline_inc=""
     9467  readline_libs=-lreadline
    94849468
    94859469fi
    94869470
     
    1042810412if test $ac_cv_lib_geotiff_main = yes; then
    1042910413   use_geotiff=yes
    1043010414
    10431   ga_include_prefix='-I$(supp_include_dir)'
    10432 
    10433   for ga_include_name in tiff geotiff ; do
    10434       geotiff_inc="$geotiff_inc ${ga_include_prefix}/${ga_include_name}"
    10435   done
    10436 
    10437 
    10438   ga_lib_prefix='$(supp_lib_dir)/lib'
    10439   ga_lib_suffix='.a'
    10440   for ga_lib_name in tiff geotiff ; do
    10441       geotiff_libs="$geotiff_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    10442   done
    10443 
     10415  geotiff_inc=""
     10416  geotiff_libs="-lgeotiff -ltiff"
    1044410417
    1044510418fi
    1044610419
     
    1069710670if test $ac_cv_lib_shp_main = yes; then
    1069810671   use_shp=yes
    1069910672
    10700   ga_include_prefix='-I$(supp_include_dir)'
    10701 
    10702   for ga_include_name in shapelib shp ; do
    10703       shp_inc="$shp_inc ${ga_include_prefix}/${ga_include_name}"
    10704   done
    10705 
    10706 
    10707   ga_lib_prefix='$(supp_lib_dir)/lib'
    10708   ga_lib_suffix='.a'
    10709   for ga_lib_name in shp ; do
    10710       shp_libs="$shp_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    10711   done
    10712 
     10673  shp_inc=""
     10674  shp_libs=-lshp
    1071310675
    1071410676fi
    1071510677
     
    1136111323if test $ac_cv_lib_gd_gdImageCreate = yes; then
    1136211324   use_printim=yes
    1136311325
    11364   ga_include_prefix='-I$(supp_include_dir)'
    11365 
    11366   for ga_include_name in gd ; do
    11367       printim_inc="$printim_inc ${ga_include_prefix}/${ga_include_name}"
    11368   done
    11369 
    11370           if test "$have_jpeg" = "yes" ; then
    11371 
    11372   ga_lib_prefix='$(supp_lib_dir)/lib'
    11373   ga_lib_suffix='.a'
    11374   for ga_lib_name in gd png12 z jpeg ; do
    11375       printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    11376   done
    11377 
    11378           else
    11379 
    11380   ga_lib_prefix='$(supp_lib_dir)/lib'
    11381   ga_lib_suffix='.a'
    11382   for ga_lib_name in gd png12 z ; do
    11383       printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    11384   done
    11385 
    11386           fi
     11326  printim_inc=""
     11327  printim_libs=-lgd
    1138711328
    1138811329fi
    1138911330
     
    1292612867
    1292712868  ga_include_prefix='-I$(supp_include_dir)'
    1292812869
    12929   for ga_include_name in grib2c ; do
    12930       grib2_inc="$grib2_inc ${ga_include_prefix}/${ga_include_name}"
    12931   done
    12932 
     12870  grib2_inc=""
    1293312871
    1293412872  ga_lib_prefix='$(supp_lib_dir)/lib'
    1293512873  ga_lib_suffix='.a'
    1293612874  for ga_lib_name in grib2c jasper png12 z ; do
    12937       grib2_libs="$grib2_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
     12875      grib2_libs="$grib2_libs -l${ga_lib_name}"
    1293812876  done
    1293912877
    1294012878
     
    1426014198if test $ac_cv_lib_mfhdf_main = yes; then
    1426114199   use_hdf=yes
    1426214200
    14263   ga_include_prefix='-I$(supp_include_dir)'
    14264 
    14265   for ga_include_name in hdf udunits ; do
    14266       hdf_inc="$hdf_inc ${ga_include_prefix}/${ga_include_name}"
    14267   done
    14268 
    14269 
    14270   ga_lib_prefix='$(supp_lib_dir)/lib'
    14271   ga_lib_suffix='.a'
     14201  hdf_inc=""
    1427214202  for ga_lib_name in mfhdf df udunits sz jpeg z ; do
    14273       hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
     14203      hdf_libs="$hdf_libs -l${ga_lib_name}"
    1427414204  done
    1427514205
    1427614206
     
    1671516645if test $ac_cv_lib_hdf5_main = yes; then
    1671616646   use_hdf5=yes
    1671716647
    16718   ga_include_prefix='-I$(supp_include_dir)'
    16719 
    16720   for ga_include_name in hdf5 ; do
    16721       hdf5_inc="$hdf5_inc ${ga_include_prefix}/${ga_include_name}"
    16722   done
    16723 
    16724 
    16725   ga_lib_prefix='$(supp_lib_dir)/lib'
    16726   ga_lib_suffix='.a'
    16727   for ga_lib_name in hdf5 sz jpeg z ; do
    16728       hdf5_libs="$hdf5_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    16729   done
    16730 
     16648  hdf5_inc=""
     16649  hdf5_libs=-lhdf5
    1673116650
    1673216651fi
    1673316652
     
    1732817247
    1732917248  ga_include_prefix='-I$(supp_include_dir)'
    1733017249
    17331   for ga_include_name in udunits netcdf ; do
    17332       nc_inc="$nc_inc ${ga_include_prefix}/${ga_include_name}"
    17333   done
    17334 
    17335 
    17336   ga_lib_prefix='$(supp_lib_dir)/lib'
    17337   ga_lib_suffix='.a'
    17338   for ga_lib_name in udunits netcdf hdf5_hl hdf5 z sz curl ; do
    17339       nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    17340   done
    17341 
     17250  nc_inc=""
     17251  nc_libs=-lnetcdf
    1734217252
    1734317253fi
    1734417254
     
    1785117761if test $ac_cv_lib_netcdf_main = yes; then
    1785217762   use_nc="yes"
    1785317763
    17854   ga_include_prefix='-I$(supp_include_dir)'
    17855 
    17856   for ga_include_name in udunits netcdf ; do
    17857       nc_inc="$nc_inc ${ga_include_prefix}/${ga_include_name}"
    17858   done
    17859 
    17860 
    17861   ga_lib_prefix='$(supp_lib_dir)/lib'
    17862   ga_lib_suffix='.a'
    17863   for ga_lib_name in netcdf udunits ; do
    17864       nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    17865   done
    17866 
     17764  nc_inc=""
     17765  nc_libs=-lnetcdf
    1786717766
    1786817767fi
    1786917768
     
    1925719156if test $ac_cv_lib_curl_main = yes; then
    1925819157   use_gadap="yes"
    1925919158
    19260   ga_include_prefix='-I$(supp_include_dir)'
    19261 
    19262   for ga_include_name in gadap ; do
    19263       gadap_inc="$gadap_inc ${ga_include_prefix}/${ga_include_name}"
    19264   done
    19265 
    19266 
    19267   ga_lib_prefix='$(supp_lib_dir)/lib'
    19268   ga_lib_suffix='.a'
    19269   for ga_lib_name in gadap dapclient dap curl xml2 z ; do
    19270       gadap_libs="$gadap_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
    19271   done
    19272 
     19159  gadap_inc=""
     19160  gadap_libs="-lgadap -ldap -ldapserver -ldapclient -lcurl -lidn -lssl -lcrypto -lz -lxml2 -lpthread -lz -liconv -lm"
    1927319161
    1927419162fi
    1927519163
Note: See TracBrowser for help on using the repository browser.