$OpenBSD: patch-configure,v 1.4 2007/06/06 09:45:59 steven Exp $ --- configure.orig Tue May 30 01:07:42 2006 +++ configure Wed Jun 6 13:10:29 2007 @@ -468,7 +468,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='CONFTEST SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RELEASE_DATE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar SOVERSION CPP_SOVERSION F77_SOVERSION F95_SOVERSION CSIRO_SOVERSION PLPLOTGNOME_SOVERSION PLPLOT_TCL_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE cc_is_gcc_TRUE cc_is_gcc_FALSE LIB_TAG with_double_TRUE with_double_FALSE RPATH RPATHCMD with_rpath_TRUE with_rpath_FALSE DATA_DIR LIB_DIR INCLUDE_DIR TCL_DIR DRV_DIR DOC_DIR BUILD_DIR LIB_DIR_CMD INCLUDE_DIR_CMD LIB_HARDDIR DRV_HARDDIR found_kcc CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE enable_cxx enable_cxx_TRUE enable_cxx_FALSE F77 FFLAGS ac_ct_F77 HAVE_F77PARSE_CL_TRUE HAVE_F77PARSE_CL_FALSE enable_f77 enable_f77_TRUE enable_f77_FALSE FC FCFLAGS ac_ct_FC MODULESINCCMD enable_f95 enable_f95_TRUE enable_f95_FALSE has_file_cmd subdirs INCLTDL LIBLTDL build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP LIBTOOL with_ltdlsystem_TRUE with_ltdlsystem_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_CPPFLAGS PYTHON_LDFLAGS PYTHON_SITE_PKG PYTHON_EXTRA_LIBS PYTHON_EXTRA_LDFLAGS PYTHON_INSTDIR enable_python PYTHONINCCMD NUMERICINCCMD enable_python_TRUE enable_python_FALSE darwin_os_TRUE darwin_os_FALSE JAVAC JAR JAVAINCCMD enable_java JAVAWRAPPER_DIR JAVAWRAPPER_HARDDIR JAVADATA_HARDDIR PLPLOTJAVAC_WRAP_DLL enable_java_TRUE enable_java_FALSE SWIG SWIG_LIB has_matwrap has_mkoctfile has_octave OCTAVE MATWRAP MKOCTFILE OCTAVE_VERSION OCTAVE_OCT_DIR OCTAVE_M_DIR PLPLOT_OCTAVE_DIR enable_octave enable_octave_TRUE enable_octave_FALSE DEFINE_PL_DOUBLE MKOCTFILE_VARS MKINDEX ITCLINCCMD ITCLLIBCMD TCLINCCMD TCLLIBCMD enable_tcl DLNAME_LIBPLPLOT DLNAME_LIBPLPLOTD DLNAME_LIBPLPLOTTCLTK DLNAME_LIBPLPLOTTCLTKD enable_itcl_TRUE enable_itcl_FALSE enable_tcl_TRUE enable_tcl_FALSE PERL enable_pdl enable_pdl_TRUE enable_pdl_FALSE PTHREADLIBS FREETYPEINCCMD FREETYPELIBCMD UNICODE_CONFIG UNICODEINCS UNICODELIBS QHULLLIBS NNLIBS CSALIBS with_csa_TRUE with_csa_FALSE with_qhull_TRUE with_qhull_FALSE PKG_CONFIG_CHECK pkg_config_true pkg_config_false PKG_CONFIG_DIR PKG_CONFIG_ENV with_pkg_config_TRUE with_pkg_config_FALSE STATIC_DRIVERS DYNAMIC_DRIVERS CDINCCMD CDLIBCMD PKG_CONFIG GCW_CFLAGS GCW_LIBS GCWTHREAD_CFLAGS GCWTHREAD_LIBS PYGCW_CFLAGS PYGCW_LIBS GNOME_PYTHON_CFLAGS GNOME_PYTHON_LIBS gcw_true gcw_false enable_gcw enable_gcw_TRUE enable_gcw_FALSE enable_pygcw_TRUE enable_pygcw_FALSE GDINCCMD GDLIBCMD GTK_CONFIG GNOME_LIBS GNOMEUI_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG GNOME_APPLETS_LIBS GNOME_CAPPLET_LIBS GTK_CFLAGS GTK_LIBS GNOMELIBS enable_gnome_TRUE enable_gnome_FALSE LINUXVGALIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS enable_xwin_TRUE enable_xwin_FALSE ITKLIBCMD TKINCCMD TKLIBCMD enable_tk_TRUE enable_tk_FALSE enable_tkwin_TRUE enable_tkwin_FALSE PSTTF_CFLAGS PSTTF_LIBS GDI32INCCMD GDI32LIBCMD AQTINCCMD AQTLIBCMD WXWIDGETSINCCMD WXWIDGETSLIBCMD enable_dyndrivers_TRUE enable_dyndrivers_FALSE DIRNAME EXAMPLES_DIRECTORIES WWW_USER WWW_GROUP WWW_HOST WWW_DIR RSH RCP PLPLOT_WEBSITE XML_DECL JADELOG DSSSL_DTD_PUBID DB_SS_HTML_PUBID DB_SS_PRINT_PUBID DOCBOOK_DTD_PUBID SGML_CATALOGS HTML_EXT DOCBOOK2X_INC TARGETS has_perl has_onsgmls ONSGMLS ifGNUmake has_db2x_texixml DB2X_TEXIXML has_db2x_xsltproc DB2X_XSLTPROC has_openjade OPENJADE has_jadetex JADETEX has_pdfjadetex PDFJADETEX has_dvips DVIPS has_makeinfo BASE HTML_MANIFEST BASE_HTML INFO_MANIFEST BASE_INFO MAN_MANIFEST BASE_MAN MANVOL docbook_build_TRUE docbook_build_FALSE enable_docbook_TRUE enable_docbook_FALSE has_onsgmls_TRUE has_onsgmls_FALSE has_xml_pm_TRUE has_xml_pm_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='CONFTEST SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RELEASE_DATE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar SOVERSION CPP_SOVERSION F77_SOVERSION F95_SOVERSION CSIRO_SOVERSION PLPLOTGNOME_SOVERSION PLPLOT_TCL_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE cc_is_gcc_TRUE cc_is_gcc_FALSE LIB_TAG with_double_TRUE with_double_FALSE RPATH RPATHCMD with_rpath_TRUE with_rpath_FALSE DATA_DIR EXAMPLE_DIR LIB_DIR INCLUDE_DIR TCL_DIR DRV_DIR DOC_DIR BUILD_DIR LIB_DIR_CMD INCLUDE_DIR_CMD LIB_HARDDIR DRV_HARDDIR found_kcc CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE enable_cxx enable_cxx_TRUE enable_cxx_FALSE F77 FFLAGS ac_ct_F77 HAVE_F77PARSE_CL_TRUE HAVE_F77PARSE_CL_FALSE enable_f77 enable_f77_TRUE enable_f77_FALSE FC FCFLAGS ac_ct_FC MODULESINCCMD enable_f95 enable_f95_TRUE enable_f95_FALSE has_file_cmd subdirs INCLTDL LIBLTDL build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP LIBTOOL with_ltdlsystem_TRUE with_ltdlsystem_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_CPPFLAGS PYTHON_LDFLAGS PYTHON_SITE_PKG PYTHON_EXTRA_LIBS PYTHON_EXTRA_LDFLAGS PYTHON_INSTDIR enable_python PYTHONINCCMD NUMERICINCCMD enable_python_TRUE enable_python_FALSE darwin_os_TRUE darwin_os_FALSE JAVAC JAR JAVAINCCMD enable_java JAVAWRAPPER_DIR JAVAWRAPPER_HARDDIR JAVADATA_HARDDIR PLPLOTJAVAC_WRAP_DLL enable_java_TRUE enable_java_FALSE SWIG SWIG_LIB has_matwrap has_mkoctfile has_octave OCTAVE MATWRAP MKOCTFILE OCTAVE_VERSION OCTAVE_OCT_DIR OCTAVE_M_DIR PLPLOT_OCTAVE_DIR enable_octave enable_octave_TRUE enable_octave_FALSE DEFINE_PL_DOUBLE MKOCTFILE_VARS MKINDEX ITCLINCCMD ITCLLIBCMD TCLINCCMD TCLLIBCMD enable_tcl DLNAME_LIBPLPLOT DLNAME_LIBPLPLOTD DLNAME_LIBPLPLOTTCLTK DLNAME_LIBPLPLOTTCLTKD enable_itcl_TRUE enable_itcl_FALSE enable_tcl_TRUE enable_tcl_FALSE PERL enable_pdl enable_pdl_TRUE enable_pdl_FALSE PTHREADLIBS FREETYPEINCCMD FREETYPELIBCMD UNICODE_CONFIG UNICODEINCS UNICODELIBS QHULLLIBS NNLIBS CSALIBS with_csa_TRUE with_csa_FALSE with_qhull_TRUE with_qhull_FALSE PKG_CONFIG_CHECK pkg_config_true pkg_config_false PKG_CONFIG_DIR PKG_CONFIG_ENV with_pkg_config_TRUE with_pkg_config_FALSE STATIC_DRIVERS DYNAMIC_DRIVERS CDINCCMD CDLIBCMD PKG_CONFIG GCW_CFLAGS GCW_LIBS GCWTHREAD_CFLAGS GCWTHREAD_LIBS PYGCW_CFLAGS PYGCW_LIBS GNOME_PYTHON_CFLAGS GNOME_PYTHON_LIBS gcw_true gcw_false enable_gcw enable_gcw_TRUE enable_gcw_FALSE enable_pygcw_TRUE enable_pygcw_FALSE GDINCCMD GDLIBCMD GTK_CONFIG GNOME_LIBS GNOMEUI_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG GNOME_APPLETS_LIBS GNOME_CAPPLET_LIBS GTK_CFLAGS GTK_LIBS GNOMELIBS enable_gnome_TRUE enable_gnome_FALSE LINUXVGALIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS enable_xwin_TRUE enable_xwin_FALSE ITKLIBCMD TKINCCMD TKLIBCMD enable_tk_TRUE enable_tk_FALSE enable_tkwin_TRUE enable_tkwin_FALSE PSTTF_CFLAGS PSTTF_LIBS GDI32INCCMD GDI32LIBCMD AQTINCCMD AQTLIBCMD WXWIDGETSINCCMD WXWIDGETSLIBCMD enable_dyndrivers_TRUE enable_dyndrivers_FALSE DIRNAME EXAMPLES_DIRECTORIES WWW_USER WWW_GROUP WWW_HOST WWW_DIR RSH RCP PLPLOT_WEBSITE XML_DECL JADELOG DSSSL_DTD_PUBID DB_SS_HTML_PUBID DB_SS_PRINT_PUBID DOCBOOK_DTD_PUBID SGML_CATALOGS HTML_EXT DOCBOOK2X_INC TARGETS has_perl has_onsgmls ONSGMLS ifGNUmake has_db2x_texixml DB2X_TEXIXML has_db2x_xsltproc DB2X_XSLTPROC has_openjade OPENJADE has_jadetex JADETEX has_pdfjadetex PDFJADETEX has_dvips DVIPS has_makeinfo BASE HTML_MANIFEST BASE_HTML INFO_MANIFEST BASE_INFO MAN_MANIFEST BASE_MAN MANVOL docbook_build_TRUE docbook_build_FALSE enable_docbook_TRUE enable_docbook_FALSE has_onsgmls_TRUE has_onsgmls_FALSE has_xml_pm_TRUE has_xml_pm_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3564,8 +3564,9 @@ fi -test -z "$DATA_DIR" && DATA_DIR='${datadir}/${PACKAGE}${VERSION}' +test -z "$DATA_DIR" && DATA_DIR='${datadir}/${PACKAGE}' +test -z "$EXAMPLE_DIR" && EXAMPLE_DIR='${datadir}/examples/${PACKAGE}' test -z "$LIB_DIR" && LIB_DIR='${libdir}' @@ -3578,7 +3579,7 @@ test -z "$BIN_DIR" && BIN_DIR='${bindir}' test -z "$TCL_DIR" && TCL_DIR="$DATA_DIR/tcl" -test -z "$DRV_DIR" && DRV_DIR="$LIB_DIR/${PACKAGE}${VERSION}/drivers${LIB_TAG}" +test -z "$DRV_DIR" && DRV_DIR="$LIB_DIR/${PACKAGE}/drivers${LIB_TAG}" ### Documentation directory @@ -12753,6 +12754,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib: fi output_verbose_link_cmd='echo' ;; + openbsd*) + archive_cmds_CXX='$CC -shared -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; osf3*) case $cc_basename in KCC*) @@ -22030,8 +22039,7 @@ echo "$as_me: WARNING: $OCTAVE not found, disabling Oc # Get Octave version echo "$as_me:$LINENO: checking Octave version" >&5 echo $ECHO_N "checking Octave version... $ECHO_C" >&6 - OCTAVE_VERSION=`$OCTAVE --version | sed 's/^.*version //;q' \ - | sed 's/ .*$//'` + OCTAVE_VERSION=`octave-config -p VERSION` echo "$as_me:$LINENO: result: $OCTAVE_VERSION" >&5 echo "${ECHO_T}$OCTAVE_VERSION" >&6 @@ -22043,29 +22051,15 @@ echo "${ECHO_T}$OCTAVE_VERSION" >&6 echo "$as_me:$LINENO: checking Octave prefix" >&5 echo $ECHO_N "checking Octave prefix... $ECHO_C" >&6 -OCTAVE_PREFIX=`$OCTAVE -q -f <&5 echo "${ECHO_T}$OCTAVE_PREFIX" >&6 echo "$as_me:$LINENO: checking Octave m dir" >&5 echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6 - if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then - # Octave version 2.1 -OCTAVE_M_DIR=`$OCTAVE -q -f <&6 echo "$as_me:$LINENO: checking Octave oct dir" >&5 echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6 - if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then - # Octave version 2.1 -OCTAVE_OCT_DIR=`$OCTAVE -q -f <