Mercurial > forge

comparison main/netcdf/src/configure.base @ 12630:fa07b71bcbfb octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge patch from bug #44837, of-netcdf wont cross compile
author abarth93
date Wed, 10 Jun 2015 12:37:24 +0000
parents 556527c15304
children 1a348ee9a848
comparison
equal deleted inserted replaced
12629:fe288ae1e8d9 12630:fa07b71bcbfb
47 dnl but defines --oct-site-dir and --m-site-dir 47 dnl but defines --oct-site-dir and --m-site-dir
48 48
49 dnl Check for mkoctfile 49 dnl Check for mkoctfile
50 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) 50 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
51 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) 51 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
52
53 AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
54 test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path])
52 55
53 AC_SUBST(ver) 56 AC_SUBST(ver)
54 AC_SUBST(subver) 57 AC_SUBST(subver)
55 AC_SUBST(mpath) 58 AC_SUBST(mpath)
56 AC_SUBST(opath) 59 AC_SUBST(opath)
250 $2=`echo "disp($1)" | $OCTAVE -qf` 253 $2=`echo "disp($1)" | $OCTAVE -qf`
251 AC_MSG_RESULT($$2) 254 AC_MSG_RESULT($$2)
252 AC_SUBST($2) 255 AC_SUBST($2)
253 ]) 256 ])
254 257
258 AC_DEFUN(OCTAVE_CONFIG_EVAL,
259 [AC_MSG_CHECKING([for $1 in octave-config])
260 $2=`$OCTAVE_CONFIG -p $1`
261 AC_MSG_RESULT($$2)
262 AC_SUBST($2)
263 ])
264
255 dnl Check status of an octave variable 265 dnl Check status of an octave variable
256 dnl 266 dnl
257 dnl OCTAVE_CHECK_EXIST(variable,action_if_true,action_if_false) 267 dnl OCTAVE_CHECK_EXIST(variable,action_if_true,action_if_false)
258 dnl 268 dnl
259 AC_DEFUN(OCTAVE_CHECK_EXIST, 269 AC_DEFUN(OCTAVE_CHECK_EXIST,
267 fi 277 fi
268 ]) 278 ])
269 279
270 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version 280 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
271 AC_CHECK_PROG(OCTAVE,octave,octave) 281 AC_CHECK_PROG(OCTAVE,octave,octave)
272 OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION) 282 OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
273 283
274 dnl grab canonical host type so we can write system specific install stuff 284 dnl grab canonical host type so we can write system specific install stuff
275 OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type) 285 OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
276 286
277 dnl grab SHLEXT from octave config 287 dnl grab SHLEXT from octave config
278 OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) 288 OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
279 289
280 AC_PROG_LN_S 290 AC_PROG_LN_S
281 291
282 AC_PROG_RANLIB 292 AC_PROG_RANLIB
283 293
308 ;; 318 ;;
309 esac 319 esac
310 320
311 dnl checking for nc-config 321 dnl checking for nc-config
312 322
313 AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config) 323 dnl AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config)
324 AC_CHECK_TOOL(NC_CONFIG, nc-config, nc-config)
314 if test -z "$NC_CONFIG"; then 325 if test -z "$NC_CONFIG"; then
315 AC_MSG_ERROR([nc-config not found], 1); 326 AC_MSG_ERROR([nc-config not found], 1);
316 fi 327 fi
317 328
318 NETCDF_LIBS="$NETCDF_LIBS `nc-config --libs`" 329 NETCDF_LIBS="$NETCDF_LIBS `$NC_CONFIG --libs`"
319 NETCDF_CFLAGS="$NETCDF_CFLAGS `nc-config --cflags`" 330 NETCDF_CFLAGS="$NETCDF_CFLAGS `$NC_CONFIG --cflags`"
320 331
321 332
322 CONFIGURE_OUTPUTS="Makeconf" 333 CONFIGURE_OUTPUTS="Makeconf"
323 STATUS_MSG=" 334 STATUS_MSG="
324 octave commands will install into the following directories: 335 octave commands will install into the following directories:
334 man pages: $mandir 345 man pages: $mandir
335 libraries: $libdir 346 libraries: $libdir
336 headers: $includedir 347 headers: $includedir
337 348
338 octave-forge is configured with 349 octave-forge is configured with
339 octave: $OCTAVE (version $OCTAVE_VERSION) 350 octave: $OCTAVE (version $OCTAVE_VERSION)
340 mkoctfile: $MKOCTFILE for Octave $subver 351 mkoctfile: $MKOCTFILE for Octave $subver
352 octave-config: $OCTAVE_CONFIG for Octave $subver
341 netCDF compiler flags: $NETCDF_CFLAGS 353 netCDF compiler flags: $NETCDF_CFLAGS
342 netCDF libraries: $NETCDF_LIBS" 354 netCDF libraries: $NETCDF_LIBS"