version 1.140, 2004/05/28 11:07:11
|
version 1.141, 2004/06/01 16:09:46
|
Line 76 AC_CHECK_LIB(socket, socket, )
|
Line 76 AC_CHECK_LIB(socket, socket, )
|
AC_CHECK_LIB(inet, connect) |
AC_CHECK_LIB(inet, connect) |
AC_CHECK_LIB(nsl, t_accept) |
AC_CHECK_LIB(nsl, t_accept) |
AC_CHECK_LIB(dl, dlopen) |
AC_CHECK_LIB(dl, dlopen) |
AC_PATH_X |
#AC_PATH_X |
AC_PATH_XTRA |
#AC_PATH_XTRA |
|
|
dnl |
dnl |
dnl Check for libXp |
|
dnl |
|
|
|
for ac_dir in \ |
|
/usr/X11R6/lib \ |
|
/usr/X11R5/lib \ |
|
\ |
|
/usr/lib/X11R6 \ |
|
/usr/lib/X11R5 \ |
|
\ |
|
/usr/local/X11R6/lib \ |
|
/usr/local/X11R5/lib \ |
|
\ |
|
/usr/local/lib/X11R6 \ |
|
/usr/local/lib/X11R5 \ |
|
\ |
|
/usr/X11/lib \ |
|
/usr/lib/X11 \ |
|
/usr/local/X11/lib \ |
|
/usr/local/lib/X11 \ |
|
\ |
|
/usr/X386/lib \ |
|
/usr/x386/lib \ |
|
/usr/XFree86/lib/X11 \ |
|
\ |
|
/usr/dt/lib \ |
|
\ |
|
/usr/lib \ |
|
/usr/local/lib \ |
|
/usr/unsupported/lib \ |
|
/usr/athena/lib \ |
|
/usr/local/x11r5/lib \ |
|
/usr/lpp/Xamples/lib \ |
|
\ |
|
/usr/lesstif/lib \ |
|
/usr/local/lesstif/lib\ |
|
/usr/gnu/lesstif/lib \ |
|
$HOME/lesstif/lib \ |
|
; \ |
|
do |
|
if test -r "$ac_dir/libXp.a" -o -r "$ac_dir/libXp.so"; then |
|
echo "found libXp.a" |
|
X_PRE_LIBS="-lXp ${X_PRE_LIBS}" |
|
break |
|
fi |
|
done |
|
dnl |
|
dnl Checks for header files. |
dnl Checks for header files. |
dnl |
dnl |
|
|
Line 394 if test "$with_wx" = "yes" ; then
|
Line 347 if test "$with_wx" = "yes" ; then
|
# WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode" |
# WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode" |
fi |
fi |
if test $with_wxdebug = yes ; then |
if test $with_wxdebug = yes ; then |
WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug --enable-debug_cntxt --enable-debug_gdb --enable-debug_info --enable-debug_flag --enable-mem_tracing" |
WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug" |
|
# SG: I've disabled other debug options because the lib has bugs when using these flags (maybe these flags are not often used by wxWidgets developpers ) |
|
# WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug --enable-debug_cntxt --enable-debug_gdb --enable-debug_info --enable-debug_flag --enable-mem_tracing" |
fi |
fi |
|
|
# launch the configure |
# launch the configure |
Line 762 if test "$with_gl" = "yes" ; then
|
Line 717 if test "$with_gl" = "yes" ; then
|
if test "$freetype_inc" = "yes" ; then |
if test "$freetype_inc" = "yes" ; then |
if test "$xft_inc" = "yes" ; then |
if test "$xft_inc" = "yes" ; then |
if test "$stdglu_inc" = "yes" ; then |
if test "$stdglu_inc" = "yes" ; then |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXmu -lXft -lfreetype -lGL -lGLU ${GTKGL_LIBS} -lstdc++" |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXft -lfreetype -lGL -lGLU ${GTKGL_LIBS} -lstdc++" |
else |
else |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXmu -lXft -lfreetype -lGL -lGLU ${GTKGL_LIBS}" |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lXft -lfreetype -lGL -lGLU ${GTKGL_LIBS}" |
fi |
fi |
GL_OPTIONS="-D_GL" |
GL_OPTIONS="-D_GL" |
fi |
fi |