Update of /cvsroot/vba/VisualBoyAdvance
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21464
Modified Files:
configure configure.in
Log Message:
FIX: fixed compilation issues on Linux
Index: configure
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure 20 Dec 2004 15:02:27 -0000 1.27
--- configure 3 Sep 2006 21:52:24 -0000 1.28
***************
*** 4464,4468 ****
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
! #include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 4464,4468 ----
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
! #include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 4491,4495 ****
for ac_dir in $ac_x_header_dirs; do
! if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
--- 4491,4495 ----
for ac_dir in $ac_x_header_dirs; do
! if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
***************
*** 4505,4509 ****
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
! LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
--- 4505,4509 ----
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
! LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
***************
*** 4512,4520 ****
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
! #include <X11/Intrinsic.h>
int
main ()
{
! XtMalloc (0)
;
return 0;
--- 4512,4520 ----
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
! #include <X11/Xlib.h>
int
main ()
{
! XrmInitialize ()
;
return 0;
***************
*** 4554,4558 ****
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
! if test -r $ac_dir/libXt.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
--- 4554,4558 ----
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
! if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
***************
*** 5654,5657 ****
--- 5654,5659 ----
VBA_LIBS="../gb/libgb.a"
+ CXXFLAGS="$CXXFLAGS -DBKPT_SUPPORT"
+
if test "x$enable_c_core" = xyes; then
CXXFLAGS="$CXXFLAGS -DC_CORE"
Index: configure.in
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** configure.in 20 Dec 2004 15:02:43 -0000 1.26
--- configure.in 3 Sep 2006 21:52:24 -0000 1.27
***************
*** 105,108 ****
--- 105,110 ----
VBA_LIBS="../gb/libgb.a"
+ CXXFLAGS="$CXXFLAGS -DBKPT_SUPPORT"
+
if test "x$enable_c_core" = xyes; then
CXXFLAGS="$CXXFLAGS -DC_CORE"
|