/[public]/psiconv/trunk/aclocal.m4
ViewVC logotype

Diff of /psiconv/trunk/aclocal.m4

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 48 Revision 49
… …
137CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ 137CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
138LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ 138LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
139LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ 139LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
140DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ 140DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
141${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ 141${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
142$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ 142$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
143|| AC_MSG_ERROR([libtool configure failed]) 143|| AC_MSG_ERROR([libtool configure failed])
144 144
145# Reload cache, that may have been modified by ltconfig 145# Reload cache, that may have been modified by ltconfig
146AC_CACHE_LOAD 146AC_CACHE_LOAD
147 147
… …
168AC_REQUIRE([AC_PROG_CC])dnl 168AC_REQUIRE([AC_PROG_CC])dnl
169AC_REQUIRE([AC_PROG_LD])dnl 169AC_REQUIRE([AC_PROG_LD])dnl
170AC_REQUIRE([AC_PROG_NM])dnl 170AC_REQUIRE([AC_PROG_NM])dnl
171AC_REQUIRE([AC_PROG_LN_S])dnl 171AC_REQUIRE([AC_PROG_LN_S])dnl
172dnl 172dnl
173
174case "$target" in
175NONE) lt_target="$host" ;;
176*) lt_target="$target" ;;
177esac
173 178
174# Check for any special flags to pass to ltconfig. 179# Check for any special flags to pass to ltconfig.
175libtool_flags="--cache-file=$cache_file" 180libtool_flags="--cache-file=$cache_file"
176test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" 181test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
177test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" 182test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
… …
187test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" 192test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
188test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" 193test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
189 194
190# Some flags need to be propagated to the compiler or linker for good 195# Some flags need to be propagated to the compiler or linker for good
191# libtool support. 196# libtool support.
192case "$host" in 197case "$lt_target" in
193*-*-irix6*) 198*-*-irix6*)
194 # Find out which ABI we are using. 199 # Find out which ABI we are using.
195 echo '[#]line __oline__ "configure"' > conftest.$ac_ext 200 echo '[#]line __oline__ "configure"' > conftest.$ac_ext
196 if AC_TRY_EVAL(ac_compile); then 201 if AC_TRY_EVAL(ac_compile); then
197 case "`/usr/bin/file conftest.o`" in 202 case "`/usr/bin/file conftest.o`" in
… …
403 AC_MSG_RESULT($LD) 408 AC_MSG_RESULT($LD)
404else 409else
405 AC_MSG_RESULT(no) 410 AC_MSG_RESULT(no)
406fi 411fi
407test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) 412test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
408AC_SUBST(LD)
409AC_PROG_LD_GNU 413AC_PROG_LD_GNU
410]) 414])
411 415
412AC_DEFUN(AC_PROG_LD_GNU, 416AC_DEFUN(AC_PROG_LD_GNU,
413[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, 417[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
… …
449 IFS="$ac_save_ifs" 453 IFS="$ac_save_ifs"
450 test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm 454 test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
451fi]) 455fi])
452NM="$ac_cv_path_NM" 456NM="$ac_cv_path_NM"
453AC_MSG_RESULT([$NM]) 457AC_MSG_RESULT([$NM])
454AC_SUBST(NM)
455]) 458])
456 459
457# AC_CHECK_LIBM - check for math library 460# AC_CHECK_LIBM - check for math library
458AC_DEFUN(AC_CHECK_LIBM, 461AC_DEFUN(AC_CHECK_LIBM,
459[AC_REQUIRE([AC_CANONICAL_HOST])dnl 462[AC_REQUIRE([AC_CANONICAL_HOST])dnl
460LIBM= 463LIBM=
461case "$host" in 464case "$lt_target" in
462*-*-beos* | *-*-cygwin*) 465*-*-beos* | *-*-cygwin*)
463 # These system don't have libm 466 # These system don't have libm
464 ;; 467 ;;
465*-ncr-sysv4.3*) 468*-ncr-sysv4.3*)
466 AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") 469 AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
… …
471 ;; 474 ;;
472esac 475esac
473]) 476])
474 477
475# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for 478# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
479# the libltdl convenience library and INCLTDL to the include flags for
476# the libltdl convenience library, adds --enable-ltdl-convenience to 480# the libltdl header and adds --enable-ltdl-convenience to the
477# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor 481# configure arguments. Note that LIBLTDL and INCLTDL are not
478# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed 482# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
479# to be `${top_builddir}/libltdl'. Make sure you start DIR with 483# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
484# with '${top_builddir}/' and INCLTDL will be prefixed with
480# '${top_builddir}/' (note the single quotes!) if your package is not 485# '${top_srcdir}/' (note the single quotes!). If your package is not
481# flat, and, if you're not using automake, define top_builddir as 486# flat and you're not using automake, define top_builddir and
482# appropriate in the Makefiles. 487# top_srcdir appropriately in the Makefiles.
483AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 488AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
484 case "$enable_ltdl_convenience" in 489 case "$enable_ltdl_convenience" in
485 no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; 490 no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
486 "") enable_ltdl_convenience=yes 491 "") enable_ltdl_convenience=yes
487 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; 492 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
488 esac 493 esac
489 LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la 494 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
490 INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) 495 INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
491]) 496])
492 497
493# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for 498# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
499# the libltdl installable library and INCLTDL to the include flags for
494# the libltdl installable library, and adds --enable-ltdl-install to 500# the libltdl header and adds --enable-ltdl-install to the configure
495# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor 501# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
496# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed 502# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
497# to be `${top_builddir}/libltdl'. Make sure you start DIR with 503# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
504# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
498# '${top_builddir}/' (note the single quotes!) if your package is not 505# with '${top_srcdir}/' (note the single quotes!). If your package is
499# flat, and, if you're not using automake, define top_builddir as 506# not flat and you're not using automake, define top_builddir and
500# appropriate in the Makefiles. 507# top_srcdir appropriately in the Makefiles.
501# In the future, this macro may have to be called after AC_PROG_LIBTOOL. 508# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
502AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 509AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
503 AC_CHECK_LIB(ltdl, main, 510 AC_CHECK_LIB(ltdl, main,
504 [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], 511 [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
505 [if test x"$enable_ltdl_install" = xno; then 512 [if test x"$enable_ltdl_install" = xno; then
… …
508 enable_ltdl_install=yes 515 enable_ltdl_install=yes
509 fi 516 fi
510 ]) 517 ])
511 if test x"$enable_ltdl_install" = x"yes"; then 518 if test x"$enable_ltdl_install" = x"yes"; then
512 ac_configure_args="$ac_configure_args --enable-ltdl-install" 519 ac_configure_args="$ac_configure_args --enable-ltdl-install"
513 LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la 520 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
514 INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) 521 INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
515 else 522 else
516 ac_configure_args="$ac_configure_args --enable-ltdl-install=no" 523 ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
517 LIBLTDL="-lltdl" 524 LIBLTDL="-lltdl"
518 INCLTDL= 525 INCLTDL=
519 fi 526 fi
Legend:
Removed from v.48  
changed lines
  Added in v.49
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26