From: wolf Date: Wed, 8 Jan 2003 15:19:09 +0000 (+0000) Subject: Don't try to infer full path to ranlib if ranlib does not exist. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=279e991f7f9ff45575f091ba0da1108d98f83d17;p=dealii-svn.git Don't try to infer full path to ranlib if ranlib does not exist. git-svn-id: https://svn.dealii.org/trunk@6888 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index 69cb9f9aa1..5ac02669f5 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.131 . +# From configure.in Revision: 1.134 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -4351,6 +4351,74 @@ cat >>confdefs.h <<_ACEOF _ACEOF +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + + echo "$as_me:$LINENO: checking for templates and pointers to const member functions bug" >&5 +echo $ECHO_N "checking for templates and pointers to const member functions bug... $ECHO_C" >&6 + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + CXXFLAGS="$CXXFLAGSG" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + template void encapsulate (void (Class::*fun_ptr)()); + + struct X { + void bar () const; + }; + + void foo () { + encapsulate(&X::bar); + }; + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6 + +cat >>confdefs.h <<\_ACEOF +#define DEAL_II_TEMPL_CONST_MEM_PTR_BUG 1 +_ACEOF + + fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6365,7 +6433,8 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -# Extract the first word of "$RANLIB", so it can be a program name with args. +if test "$RANLIB" != ":" ; then + # Extract the first word of "$RANLIB", so it can be a program name with args. set dummy $RANLIB; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -6404,6 +6473,7 @@ else echo "${ECHO_T}no" >&6 fi +fi diff --git a/deal.II/configure.in b/deal.II/configure.in index 76ab623b7d..c6631de14b 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -264,9 +264,13 @@ AC_SUBST(enableshared) AC_SUBST(lib_suffix) dnl Also look for RANLIB, since some rather old systems (ah, and MAC OS X!) -dnl still require it for statically linked libraries +dnl still require it for statically linked libraries. On other systems, +dnl RANLIB is not available, so skip the second check that tries to get +dnl the full path for the executable that was found in the first one. AC_PROG_RANLIB -AC_PATH_PROG(RANLIB,$RANLIB) +if test "$RANLIB" != ":" ; then + AC_PATH_PROG(RANLIB,$RANLIB) +fi AC_SUBST(RANLIB)