Fix STR #2516: under MSys, the FLTK_DOCDIR config.h variable did not allow
fluid to find its help files even if they are correctly installed. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8474 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
d98a0fede6
commit
b693eac483
25
configure.in
25
configure.in
@ -1292,11 +1292,21 @@ if test `uname` = Darwin; then
|
||||
fi
|
||||
|
||||
dnl Define the FLTK documentation directory...
|
||||
if test x$prefix = xNONE; then
|
||||
AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
|
||||
fi
|
||||
case $uname in
|
||||
MINGW*)
|
||||
# Determine the path where MSys has /usr installed
|
||||
msyspath=`mount | grep '\/usr' | grep -v '\/usr\/bin' | cut -d ' ' -f -1 | sed -e 's/\\\/\// g'`
|
||||
# Then substitute that in the WIN32 path instead of /usr
|
||||
AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$msyspath/local/share/doc/fltk")
|
||||
;;
|
||||
*)
|
||||
if test x$prefix = xNONE; then
|
||||
AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl Define the FLTK data directory...
|
||||
if test x$prefix = xNONE; then
|
||||
@ -1339,6 +1349,11 @@ echo " exec_prefix=$exec_prefix"
|
||||
echo " includedir=$includedir"
|
||||
echo " libdir=$libdir"
|
||||
echo " mandir=$mandir"
|
||||
case $uname in
|
||||
MINGW*)
|
||||
echo " MSys docpath=$msyspath/local/share/doc/fltk"
|
||||
;;
|
||||
esac
|
||||
echo " Graphics: $graphics"
|
||||
|
||||
if test x$JPEG = x; then
|
||||
|
Loading…
Reference in New Issue
Block a user