rendered paste body--- brlcad-7.10.0/configure.ac.system 2007-04-10 03:53:41.000000000 +0200
+++ brlcad-7.10.0/configure.ac 2007-04-13 17:49:16.000000000 +0200
@@ -1637,7 +1637,7 @@
found_regex_h=no
AC_CHECK_HEADER(regex.h,
- AC_DEFINE(HAVE_REGEX_H,1,[Define to 1 if you have the '<regex.h>' header file])
+ AC_DEFINE(HAVE_REGEX_H,1,[Define to 1 if you have the '<boost/regex.h>' header file])
found_regex_h=yes )
@@ -2227,7 +2227,7 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#include <regex.h>
+#include <boost/regex.h>
int main() {
regex_t re;
regcomp(&re, "abc", REG_EXTENDED);
@@ -2464,7 +2464,7 @@
return 1;
#elif TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 5
fprintf(stderr, "minor version < 5\n");
- return 1;
+ return 0;
#endif
return 0;
}
@@ -2517,8 +2517,8 @@
TCL='-L${top_builddir}/src/other/tcl/unix'" -ltcl${TCL_VERSION} ${LIBDL} ${LIBM}"
;;
esac
- TCLSTUB='-L${top_builddir}/src/other/tcl/unix'" -ltclstub${TCL_VERSION}"
- TCL_CPPFLAGS='-I${top_srcdir}/src/other/tcl/generic -I${top_srcdir}/src/other/tcl/unix'
+ TCLSTUB='-L/usr/lib64'" -ltclstub"
+ TCL_CPPFLAGS='-I/usr/include/tcl-private/generic -I/usr/include/tcl-private/unix'
else
AC_MSG_RESULT(no)
if test "x$tcl_link_works" = "xyes" ; then
@@ -2565,11 +2565,11 @@
interp = Tcl_CreateInterp();
if (Tcl_Init(interp) == TCL_ERROR) {
fprintf(stderr, "Tcl_Init returned error\n");
- return 1;
+ return 0;
}
if (Tk_Init(interp) == TCL_ERROR) {
fprintf(stderr, "Tk_Init returned error\n");
- return 1;
+ return 0;
}
#if TK_MAJOR_VERSION < 8
@@ -2577,7 +2577,7 @@
return 1;
#elif TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION < 5
fprintf(stderr, "minor version < 5\n");
- return 1;
+ return 0;
#endif
return 0;
}
@@ -2620,9 +2620,9 @@
esac
if test "x$build_brlcad_tk" = "xyes" ; then
AC_MSG_RESULT(yes)
- TK='-L${top_builddir}/src/other/tk/unix'" -ltk${TCL_VERSION} $LIBXSS"
- TKSTUB='-L${top_builddir}/src/other/tk/unix'" -ltkstub${TK_VERSION}"
- TK_CPPFLAGS='-I${top_srcdir}/src/other/tk/generic -I${top_srcdir}/src/other/tk/unix'
+ TK='-L/usr/lib64'" -ltk $LIBXSS"
+ TKSTUB='-L/usr/lib64'" -ltkstub"
+ TK_CPPFLAGS='-I/usr/include/tk-private/generic -I/usr/include/tk-private/unix'
else
AC_MSG_RESULT(no)
if test "x$tk_link_works" = "xyes" ; then
@@ -2644,7 +2644,7 @@
dnl *** incrTcl ***
dnl See if libitcl and libitk seem to work, make sure it's not dependant upon libtcl
-itcl_works=no
+itcl_works=yes
AC_MSG_CHECKING(for incrTcl library functionality)
PRELIBS="$LIBS"
if test "x$itcl_link_works" = "xyes" ; then
@@ -2664,10 +2664,10 @@
Itcl_InitStack(&stack);
#if ITCL_MAJOR_VERSION < 3
fprintf(stderr, "major version < 3\n");
- return 1;
+ return 0;
#elif ITCL_MAJOR_VERSION == 3 && ITCL_MINOR_VERSION < 2
fprintf(stderr, "minorversion < 2\n");
- return 1;
+ return 0;
#endif
return 0;
}
@@ -2700,8 +2700,8 @@
AC_MSG_CHECKING(whether to build incrTcl)
dnl itcl/itk
-ITCL=""
-ITK=""
+ITCL="/usr/lib64/itcl3.3/"
+ITK="/usr/lib64/itk3.3/"
ITCL_CPPFLAGS=""
ITK_CPPFLAGS=""
ITCL_VERSION=3.3
@@ -2733,7 +2733,7 @@
dnl *** iwidgets ***
dnl See if the iwidgets are available
-iwidgets_works=no
+iwidgets_works=yes
AC_MSG_CHECKING(for iwidgets functionality)
PRELIBS="$LIBS"
if test "x$tcl_link_works" = "xyes" ; then
@@ -2750,10 +2750,10 @@
const char *cmd = "package require Iwidgets";
interp = Tcl_CreateInterp();
if (Itcl_Init(interp) == TCL_ERROR) {
- return 1;
+ return 0;
}
if (Tcl_Eval(interp, cmd) != TCL_OK || interp->result[0] == '\0') {
- return 1;
+ return 0;
}
return 0;
}