From: S?bastien G. <kx...@us...> - 2004-05-01 14:04:33
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13445 Modified Files: Makefile.in configure configure.in Log Message: Added gtkmm 2.4 support. Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.in 29 Mar 2004 22:08:37 -0000 1.11 --- Makefile.in 1 May 2004 14:03:51 -0000 1.12 *************** *** 64,67 **** --- 64,68 ---- GMSGFMT = @GMSGFMT@ GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_CPPFLAGS = @GTKMM_CPPFLAGS@ GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** configure 25 Apr 2004 19:05:59 -0000 1.22 --- configure 1 May 2004 14:03:51 -0000 1.23 *************** *** 310,314 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB NASM CPP EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS PKG_CONFIG GTKMM_CFLAGS GTKMM_LIBS VBA_EXTRA VBA_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB NASM CPP EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS PKG_CONFIG GTKMM_CFLAGS GTKMM_LIBS GTKMM_CPPFLAGS VBA_EXTRA VBA_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 866,870 **** --enable-profiling enable profiling (default is yes) --enable-sdl build the SDL frontend (default is yes) ! --enable-gtk build the GTK+ frontend (default is no) --enable-dev enable development features (default is yes) --disable-nls do not use Native Language Support --- 866,870 ---- --enable-profiling enable profiling (default is yes) --enable-sdl build the SDL frontend (default is yes) ! --enable-gtk=VERSION build the GTK+ frontend (default is no) --enable-dev enable development features (default is yes) --disable-nls do not use Native Language Support *************** *** 1870,1875 **** enableval="$enable_gtk" else ! enable_gtk=no fi; --- 1870,1886 ---- enableval="$enable_gtk" + if test "x$enable_gtk" != xno; then + enable_gtk=yes + if test "x$enableval" = xyes; then + gtk_version=2.0 + else + gtk_version=$enableval + fi + fi + else ! ! enable_gtk=no ! fi; *************** *** 8186,8190 **** fi ! SDL_VERSION=1.2.2 # Check whether --with-sdl-prefix or --without-sdl-prefix was given. --- 8197,8202 ---- fi ! if test "x$enable_sdl" = xyes || test "x$enable_gtk" = xyes; then ! SDL_VERSION=1.2.2 # Check whether --with-sdl-prefix or --without-sdl-prefix was given. *************** *** 8472,8476 **** SDL_LIBS="" ! { { echo "$as_me:$LINENO: error: *** Couldn't find SDL library (version >= $SDL_VERSION)." >&5 echo "$as_me: error: *** Couldn't find SDL library (version >= $SDL_VERSION)." >&2;} { (exit 1); exit 1; }; } --- 8484,8488 ---- SDL_LIBS="" ! { { echo "$as_me:$LINENO: error: *** Couldn't find SDL library (version >= $SDL_VERSION)." >&5 echo "$as_me: error: *** Couldn't find SDL library (version >= $SDL_VERSION)." >&2;} { (exit 1); exit 1; }; } *************** *** 8481,8484 **** --- 8493,8497 ---- rm -f conf.sdltest + fi if test "x$enable_sdl" = xyes; then *************** *** 8690,8697 **** PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for gtkmm-2.0 libglademm-2.0 >= 2.1.0" >&5 ! echo $ECHO_N "checking for gtkmm-2.0 libglademm-2.0 >= 2.1.0... $ECHO_C" >&6 ! if $PKG_CONFIG --exists "gtkmm-2.0 libglademm-2.0 >= 2.1.0" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- 8703,8710 ---- PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0" >&5 ! echo $ECHO_N "checking for gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0... $ECHO_C" >&6 ! if $PKG_CONFIG --exists "gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 *************** *** 8700,8704 **** echo "$as_me:$LINENO: checking GTKMM_CFLAGS" >&5 echo $ECHO_N "checking GTKMM_CFLAGS... $ECHO_C" >&6 ! GTKMM_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.0 libglademm-2.0 >= 2.1.0"` echo "$as_me:$LINENO: result: $GTKMM_CFLAGS" >&5 echo "${ECHO_T}$GTKMM_CFLAGS" >&6 --- 8713,8717 ---- echo "$as_me:$LINENO: checking GTKMM_CFLAGS" >&5 echo $ECHO_N "checking GTKMM_CFLAGS... $ECHO_C" >&6 ! GTKMM_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0"` echo "$as_me:$LINENO: result: $GTKMM_CFLAGS" >&5 echo "${ECHO_T}$GTKMM_CFLAGS" >&6 *************** *** 8706,8710 **** echo "$as_me:$LINENO: checking GTKMM_LIBS" >&5 echo $ECHO_N "checking GTKMM_LIBS... $ECHO_C" >&6 ! GTKMM_LIBS=`$PKG_CONFIG --libs "gtkmm-2.0 libglademm-2.0 >= 2.1.0"` echo "$as_me:$LINENO: result: $GTKMM_LIBS" >&5 echo "${ECHO_T}$GTKMM_LIBS" >&6 --- 8719,8723 ---- echo "$as_me:$LINENO: checking GTKMM_LIBS" >&5 echo $ECHO_N "checking GTKMM_LIBS... $ECHO_C" >&6 ! GTKMM_LIBS=`$PKG_CONFIG --libs "gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0"` echo "$as_me:$LINENO: result: $GTKMM_LIBS" >&5 echo "${ECHO_T}$GTKMM_LIBS" >&6 *************** *** 8714,8718 **** ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. ! GTKMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkmm-2.0 libglademm-2.0 >= 2.1.0"` echo $GTKMM_PKG_ERRORS fi --- 8727,8731 ---- ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. ! GTKMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0"` echo $GTKMM_PKG_ERRORS fi *************** *** 8729,8734 **** : else ! { { echo "$as_me:$LINENO: error: Library requirements (gtkmm-2.0 libglademm-2.0 >= 2.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 ! echo "$as_me: error: Library requirements (gtkmm-2.0 libglademm-2.0 >= 2.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi --- 8742,8747 ---- : else ! { { echo "$as_me:$LINENO: error: Library requirements (gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 ! echo "$as_me: error: Library requirements (gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi *************** *** 8736,8739 **** --- 8749,8756 ---- + if test "x$gtk_version" = x2.0; then + GTKMM_CPPFLAGS="-DGTKMM20" + fi + VBA_EXTRA="$VBA_EXTRA gtk" fi *************** *** 9526,9529 **** --- 9543,9547 ---- s,@GTKMM_CFLAGS@,$GTKMM_CFLAGS,;t t s,@GTKMM_LIBS@,$GTKMM_LIBS,;t t + s,@GTKMM_CPPFLAGS@,$GTKMM_CPPFLAGS,;t t s,@VBA_EXTRA@,$VBA_EXTRA,;t t s,@VBA_LIBS@,$VBA_LIBS,;t t Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure.in 25 Apr 2004 19:06:16 -0000 1.21 --- configure.in 1 May 2004 14:03:55 -0000 1.22 *************** *** 36,41 **** AC_ARG_ENABLE(gtk, ! AC_HELP_STRING([--enable-gtk],[build the GTK+ frontend (default is no)]), ! , enable_gtk=no) AC_ARG_ENABLE(dev, --- 36,51 ---- AC_ARG_ENABLE(gtk, ! AC_HELP_STRING([--enable-gtk[=VERSION]],[build the GTK+ frontend (default is no)]),[ ! if test "x$enable_gtk" != xno; then ! enable_gtk=yes ! if test "x$enableval" = xyes; then ! gtk_version=2.0 ! else ! gtk_version=$enableval ! fi ! fi ! ],[ ! enable_gtk=no ! ]) AC_ARG_ENABLE(dev, *************** *** 119,127 **** fi ! SDL_VERSION=1.2.2 ! AM_PATH_SDL($SDL_VERSION,[ ! ],[ ! AC_MSG_ERROR([*** Couldn't find SDL library (version >= $SDL_VERSION).]) ! ]) if test "x$enable_sdl" = xyes; then --- 129,139 ---- fi ! if test "x$enable_sdl" = xyes || test "x$enable_gtk" = xyes; then ! SDL_VERSION=1.2.2 ! AM_PATH_SDL($SDL_VERSION,[ ! ],[ ! AC_MSG_ERROR([*** Couldn't find SDL library (version >= $SDL_VERSION).]) ! ]) ! fi if test "x$enable_sdl" = xyes; then *************** *** 131,137 **** if test "x$enable_gtk" = xyes; then AC_CHECK_HEADERS(libintl.h) ! PKG_CHECK_MODULES(GTKMM, gtkmm-2.0 libglademm-2.0 >= 2.1.0) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) VBA_EXTRA="$VBA_EXTRA gtk" fi --- 143,153 ---- if test "x$enable_gtk" = xyes; then AC_CHECK_HEADERS(libintl.h) ! PKG_CHECK_MODULES(GTKMM, gtkmm-$gtk_version >= 2.0.0 libglademm-$gtk_version >= 2.1.0) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) + if test "x$gtk_version" = x2.0; then + GTKMM_CPPFLAGS="-DGTKMM20" + fi + AC_SUBST(GTKMM_CPPFLAGS) VBA_EXTRA="$VBA_EXTRA gtk" fi |