From aa2bb84ebbbc2382aeae5d436f2c1a3e246ad457 Mon Sep 17 00:00:00 2001 From: havner Date: Mon, 12 Jul 2004 17:32:43 +0000 Subject: [PATCH] - fixed for 2.8 Changed files: aumix-ac250.patch -> 1.2 --- aumix-ac250.patch | 78 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/aumix-ac250.patch b/aumix-ac250.patch index 13f7397..3d13bcd 100644 --- a/aumix-ac250.patch +++ b/aumix-ac250.patch @@ -1,12 +1,20 @@ ---- aumix-2.7/configure.in.wiget Fri Jul 6 14:25:46 2001 -+++ aumix-2.7/configure.in Fri Jul 6 14:40:38 2001 -@@ -60,42 +60,44 @@ - if test $cursdflt = on; then - AC_DEFINE(HAVE_USEDEFAULT) - fi -- AC_CACHE_CHECK(for private member _use_keypad in WINDOW, +Only in aumix-2.8.orig: ABOUT-NLS +Only in aumix-2.8.orig: acconfig.h +Only in aumix-2.8.orig: acinclude.m4 +Only in aumix-2.8.orig: aclocal.m4 +Only in aumix-2.8.orig: AUTHORS +Only in aumix-2.8.orig: BUGS +Only in aumix-2.8.orig: ChangeLog +Only in aumix-2.8.orig: config.h.in +Only in aumix-2.8.orig: configure +diff -ur aumix-2.8.orig/configure.in aumix-2.8/configure.in +--- aumix-2.8.orig/configure.in 2002-11-25 02:04:16.000000000 +0100 ++++ aumix-2.8/configure.in 2004-07-12 19:29:45.135190696 +0200 +@@ -61,30 +61,30 @@ + [Define this if your ncurses library contains the use_default_colors + routine and your terminal can use transparent colors.])]) + AC_CACHE_CHECK([for private member _use_keypad in WINDOW], - aumix_cv_struct_window_usekeypad, -+ AC_CACHE_CHECK([for private member _use_keypad in WINDOW], + [aumix_cv_struct_window_usekeypad], [AC_TRY_COMPILE([#ifdef HAVE_NCURSES_H #include @@ -16,47 +24,67 @@ - aumix_cv_struct_window_usekeypad=yes, aumix_cv_struct_window_usekeypad=no)]) +#endif +], [WINDOW w; w._use_keypad;], -+ [aumix_cv_struct_window_usekeypad=yes],[ aumix_cv_struct_window_usekeypad=no)]]) ++ [aumix_cv_struct_window_usekeypad=yes],[ aumix_cv_struct_window_usekeypad=no])]) if test $aumix_cv_struct_window_usekeypad = yes; then - AC_DEFINE(HAVE_USEKEYPAD) + AC_DEFINE(HAVE_USEKEYPAD, 1, + [Define this if your ncurses library has the member _use_keypad + in structure WINDOW.]) fi fi - AC_ARG_WITH(gpm, -- [ --without-gpm Compile only without GPM support], +- [ --without-gpm Compile only without GPM support], - AC_MSG_RESULT([Compiling without GPM support]), -+ -+) -+ AC_ARG_WITH(gpm,[ --without-gpm Compile only without GPM support],[ ++]) ++ AC_ARG_WITH(gpm,[ --without-gpm Compile only without GPM support],[ + AC_MSG_RESULT([Compiling without GPM support])],[ dnl Checks for GPM library. AC_CHECK_LIB(gpm, Gpm_Repeat) - ) - AC_ARG_WITH(sysmouse, -- [ --without-sysmouse Compile only without sysmouse support], +- [ --without-sysmouse Compile only without sysmouse support], - AC_MSG_RESULT([Compiling without sysmouse support]), + ]) -+ AC_ARG_WITH(sysmouse,[ --without-sysmouse Compile only without sysmouse support],[ ++ AC_ARG_WITH(sysmouse,[ --without-sysmouse Compile only without sysmouse support],[ + AC_MSG_RESULT([Compiling without sysmouse support])], dnl Checks for sysmouse availability. -- AC_CACHE_CHECK(for CONS_MOUSECTL in machine/console.h, -- aumix_cv_cons_mousectl, -+ AC_CACHE_CHECK([for CONS_MOUSECTL in machine/console.h], -+ [aumix_cv_cons_mousectl], +- AC_CHECK_HEADERS(sys/consio.h machine/console.h, break) ++ dnl AC_CHECK_HEADERS([sys/consio.h machine/console.h], [break]) + AC_CACHE_CHECK([for CONS_MOUSECTL], + aumix_cv_cons_mousectl, [AC_EGREP_CPP([A mouse is a mouse is a mouse], - [#ifdef HAVE_MACHINE_CONSOLE_H - #include +@@ -96,14 +96,15 @@ + #endif #ifdef CONS_MOUSECTL A mouse is a mouse is a mouse - #endif -#endif], aumix_cv_cons_mousectl=yes, aumix_cv_cons_mousectl=no)]) +#endif +],[ aumix_cv_cons_mousectl=yes],[ aumix_cv_cons_mousectl=no])]) if test $aumix_cv_cons_mousectl = yes; then - AC_DEFINE(HAVE_SYSMOUSE) + AC_DEFINE(HAVE_SYSMOUSE, 1, + [Define this if you have sysmouse console mouse support and + want to use it.]) fi ) --) +-]) + AM_CONDITIONAL(CURSES, test "x$CURSLIB" != "x") AC_SUBST(CURSLIB) +Only in aumix-2.8.orig: COPYING +Only in aumix-2.8.orig: CVS +Only in aumix-2.8.orig: data +Only in aumix-2.8.orig: doc +Only in aumix-2.8.orig: INSTALL +Only in aumix-2.8.orig: install-sh +Only in aumix-2.8.orig: intl +Only in aumix-2.8.orig: Makefile.am +Only in aumix-2.8.orig: Makefile.in +Only in aumix-2.8.orig: missing +Only in aumix-2.8.orig: mkinstalldirs +Only in aumix-2.8.orig: NEWS +Only in aumix-2.8.orig: packaging +Only in aumix-2.8.orig: po +Only in aumix-2.8.orig: README +Only in aumix-2.8.orig: src +Only in aumix-2.8.orig: stamp-h.in +Only in aumix-2.8.orig: TODO -- 2.43.0