|
Lines 149-155
Link Here
|
| 149 |
# set up our default shared/non-shared data install directories |
149 |
# set up our default shared/non-shared data install directories |
| 150 |
# e.g. /usr/local/share/brlcad/7.4.0 |
150 |
# e.g. /usr/local/share/brlcad/7.4.0 |
| 151 |
AC_MSG_CHECKING([where BRL-CAD resources are to be installed]) |
151 |
AC_MSG_CHECKING([where BRL-CAD resources are to be installed]) |
| 152 |
if test "x$datadir" = "x\${prefix}/share" ; then |
152 |
if test "x$datadir" = "x${prefix}/share" ; then |
| 153 |
bc_data_dir="${bc_prefix}/share/brlcad/${BRLCAD_VERSION}" |
153 |
bc_data_dir="${bc_prefix}/share/brlcad/${BRLCAD_VERSION}" |
| 154 |
else |
154 |
else |
| 155 |
# allow a complete override |
155 |
# allow a complete override |
|
Lines 1826-1834
Link Here
|
| 1826 |
LIBS="$LIBS $LIBTK $LIBTCL" |
1826 |
LIBS="$LIBS $LIBTK $LIBTCL" |
| 1827 |
fi |
1827 |
fi |
| 1828 |
AC_TRY_RUN([ |
1828 |
AC_TRY_RUN([ |
| 1829 |
#ifdef HAVE_TK_H |
1829 |
# include <tcl.h> |
| 1830 |
# include <tk.h> |
1830 |
# include <tk.h> |
| 1831 |
#endif |
|
|
| 1832 |
#ifndef TK_MAJOR_VERSION |
1831 |
#ifndef TK_MAJOR_VERSION |
| 1833 |
# error Unknown major version of Tk |
1832 |
# error Unknown major version of Tk |
| 1834 |
#endif |
1833 |
#endif |
|
Lines 1884-1890
Link Here
|
| 1884 |
fi |
1883 |
fi |
| 1885 |
fi |
1884 |
fi |
| 1886 |
fi |
1885 |
fi |
| 1887 |
build_brlcad_tk=yes |
|
|
| 1888 |
AC_MSG_CHECKING(whether to build Tk) |
1886 |
AC_MSG_CHECKING(whether to build Tk) |
| 1889 |
dnl Need to update version number(s) in src/other/libtk/Makefile.am too |
1887 |
dnl Need to update version number(s) in src/other/libtk/Makefile.am too |
| 1890 |
TK_VERSION="8.4" |
1888 |
TK_VERSION="8.4" |
|
Lines 1993-2009
Link Here
|
| 1993 |
dnl this test is probably not sufficient if iwidgets is not locateable |
1991 |
dnl this test is probably not sufficient if iwidgets is not locateable |
| 1994 |
dnl in the tcl auto_path. |
1992 |
dnl in the tcl auto_path. |
| 1995 |
AC_TRY_RUN([ |
1993 |
AC_TRY_RUN([ |
| 1996 |
#ifdef HAVE_TCL_H |
|
|
| 1997 |
# include <tcl.h> |
1994 |
# include <tcl.h> |
| 1998 |
#endif |
|
|
| 1999 |
int main() { |
1995 |
int main() { |
| 2000 |
Tcl_Interp *interp; |
1996 |
Tcl_Interp *interp; |
| 2001 |
const char *cmd = "package require iwidgets"; |
1997 |
const char *cmd = "package require Iwidgets"; |
| 2002 |
interp = Tcl_CreateInterp(); |
1998 |
interp = Tcl_CreateInterp(); |
| 2003 |
if (Itcl_Init(interp) == TCL_ERROR) { |
1999 |
if (Tcl_Init(interp) == TCL_ERROR) { |
| 2004 |
return 1; |
2000 |
return 1; |
| 2005 |
} |
2001 |
} |
| 2006 |
if (Tcl_Eval(interp, cmd) != TCL_OK || interp->result[0] != '\0') { |
2002 |
if (Tcl_Eval(interp, cmd) != TCL_OK || interp->result[0] == '\0') { |
| 2007 |
return 1; |
2003 |
return 1; |
| 2008 |
} |
2004 |
} |
| 2009 |
return 0; |
2005 |
return 0; |
