fixed bug with icons of different sizes

made Apply work in window inspector for windows with no WM_CLASS

ChangeLog

@@ -33,6 +33,11 @@ Changes since version 0.61.1:
   defaults.c
 - fixed colormap_window crash bug (appears when launching some apps from dock,
   or removing apps from gnome panel etc)
+- added DONT_SCALE_ICONS #define
+- added --no-autolaunch patch (John Bafford <dshadow@zort.net>)
+- made Apply button work on window inspector for windows with no WM_CLASS
+- changed sound server code to be more efficient
+- fixed crash with broken apps that set mask size != pixmap size in icons
 
 Changes since version 0.61.0:
 .............................

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -326,7 +327,7 @@ uninstall: uninstall-recursive
 all-am: Makefile
 all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 

NEWS

@@ -2,7 +2,16 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
---- 0.61.2
+--- 0.62.0
+
+
+Optimizations!!
+---------------
+
+Code for converting wrlib images into X Pixmaps was optimized in many ways,
+both in the original C code and in assembly for Pentium(tm) processors (with
+and without MMX(tm)). Depending on the bit depth/color mode and CPU model,
+performance increases can go up to 150%
 
 
 NoBorder Window Attribute
@@ -42,6 +51,12 @@ The font for the geometry size will be controlled by the default
 WINGs font (SystemFont in WMGLOBAL) now.
 
 
+Others
+------
+
+- added DONT_SCALE_ICONS compile time option
+
+
 --- 0.61.1
 
 New libPropList

WINGs/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -522,7 +523,7 @@ uninstall: uninstall-recursive
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
 all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \

WINGs/Resources/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -179,7 +180,7 @@ uninstall: uninstall-am
 all-am: Makefile $(DATA)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(resdatadir)
 

acconfig.h

@@ -64,6 +64,11 @@
  * set by configure */
 #undef SHAPE
 
+
+/* define if you want support for the XINERAMA extension
+ * set by configure */
+#undef XINERAMA
+
 /* define if you want support for X window's X_LOCALE
  * set by configure */
 #undef X_LOCALE

aclocal.m4

@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -282,6 +282,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -410,7 +412,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
+#
+# the following will cause an existing older ltconfig to fail, so
+# we ignore this at the expense of the cache file... Checking this 
+# will just take longer ... bummer!
+#libtool_flags="--cache-file=$cache_file"
+#
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"

configure.in

@@ -441,6 +441,22 @@ if test "$shape" = yes; then
 fi
 
 
+
+dnl XINERAMA support
+dnl ================
+xinerama=yes
+AC_ARG_ENABLE(xinerama, 
+[  --disable-xinerama	  disable XInerama extension support],
+		xinerama=$enableval, xinerama=yes)
+
+if test "$xinerama" = yes; then
+	AC_CHECK_LIB(Xext, X, [XLIBS="-lXext $XLIBS"
+		added_xext=yes
+                AC_DEFINE(XINERAMA)], xinerama=no, $XLFLAGS $XLIBS)
+fi
+
+
+
 dnl MIT-SHM support
 dnl ===============
 shm=yes

src/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -206,8 +207,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -328,7 +329,7 @@ uninstall: uninstall-am
 all-am: Makefile $(PROGRAMS) config.h
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 

src/WindowMaker.h

@@ -423,6 +423,7 @@ typedef struct WPreferences {
         unsigned int noclip:1;        /* don't display the clip */
 	unsigned int nocpp:1;	       /* don't use cpp */
 	unsigned int noupdates:1;      /* don't require ~/GNUstep (-static) */
+	unsigned int noautolaunch:1;   /* don't autolaunch apps */
     } flags;			       /* internal flags */
 } WPreferences;
 

src/actions.c

@@ -469,14 +469,13 @@ wMaximizeWindow(WWindow *wwin, int directions)
 
 	new_height = (usableArea.y2-usableArea.y1)-FRAME_BORDER_WIDTH*2;
 	new_y = usableArea.y1;
-	if (WFLAGP(wwin, full_maximize))
-	    new_y -= wwin->frame->top_width;
-
+	if (WFLAGP(wwin, full_maximize)) {
+	    new_y -= wwin->frame->top_width - 1;
+	    new_height += wwin->frame->bottom_width - 3;
+	}
     } else {
-
 	new_y = wwin->frame_y;
 	new_height = wwin->frame->core->height;
-
     }
 
     if (!WFLAGP(wwin, full_maximize)) {

src/config.h.in

@@ -109,6 +109,10 @@
  * set by configure */
 #undef SHAPE
 
+/* define if you want support for the XINERAMA extension
+ * set by configure */
+#undef XINERAMA
+
 /* define if you want support for X window's X_LOCALE
  * set by configure */
 #undef X_LOCALE

src/defaults.c

@@ -326,12 +326,12 @@ static WOptionEnumeration seDisplayPositions[] = {
  */
 WDefaultEntry staticOptionList[] = {    
 
-    {"DisableDithering",	"NO",			NULL,
-	&wPreferences.no_dithering,	getBool,	NULL
-    },
     {"ColormapSize",	"4",			NULL,
 	&wPreferences.cmap_size,	getInt,		NULL
     },
+    {"DisableDithering",	"NO",			NULL,
+	&wPreferences.no_dithering,	getBool,	NULL
+    },
     /* static by laziness */
     {"IconSize",	"64",			NULL,
 	&wPreferences.icon_size,	getInt,		NULL

src/icon.c

@@ -399,7 +399,7 @@ wIconValidateIconSize(WScreen *scr, RImage *icon)
     
     if (!icon)
 	return NULL;
-
+#ifndef DONT_SCALE_ICONS
     if (wPreferences.icon_size != 64) {
 	w = wPreferences.icon_size * icon->width / 64;
 	h = wPreferences.icon_size * icon->height / 64;
@@ -408,6 +408,7 @@ wIconValidateIconSize(WScreen *scr, RImage *icon)
 	RDestroyImage(icon);
 	icon = tmp;
     }
+#endif
 #if 0
     if (icon->width > wPreferences.icon_size
         || icon->height > wPreferences.icon_size) {

src/main.c

@@ -421,6 +421,7 @@ print_help()
 #endif
     puts(_(" --no-dock		do not open the application Dock"));
     puts(_(" --no-clip		do not open the workspace Clip"));
+    puts(_(" --no-autolaunch	do not autolaunch applications"));
 
     puts(_(" --locale locale		locale to use"));
 
@@ -548,18 +549,14 @@ main(int argc, char **argv)
 #ifdef DEBUG
     Bool doSync = False;
 #endif
+    setlocale(LC_ALL, "");
 
     wsetabort(wAbort);
 
     /* for telling WPrefs what's the name of the wmaker binary being ran */
-    {
-/*	char *tmp;
 
-	tmp = getFullPath(argv[0]);*/
     str = wstrappend("WMAKER_BIN_NAME=", argv[0]);
-/*	free(tmp);*/
     putenv(str);
-    }
 
     ArgCount = argc;
     Arguments = argv;
@@ -586,7 +583,10 @@ main(int argc, char **argv)
 		wPreferences.flags.nocpp=1;
 	    } else
 #endif
-	    if (strcmp(argv[i], "-nodock")==0
+	    if (strcmp(argv[i], "-no-autolaunch")==0
+		|| strcmp(argv[i], "--no-autolaunch")==0) {
+			wPreferences.flags.noautolaunch = 1;
+	    } else if (strcmp(argv[i], "-nodock")==0
 		|| strcmp(argv[i], "--no-dock")==0) {
 		wPreferences.flags.nodock=1;
 	    } else if (strcmp(argv[i], "-noclip")==0
@@ -658,28 +658,16 @@ main(int argc, char **argv)
 	check_defaults();
     }
 
-#if 0
-    tmp = getenv("LANG");
-    if (tmp) {
-    	if (setlocale(LC_ALL,"") == NULL) {
-	    wwarning("cannot set locale %s", tmp);
-	    wwarning("falling back to C locale");
-	    setlocale(LC_ALL,"C");
-	    Locale = NULL;
-	} else {
-	    if (strcmp(tmp, "C")==0 || strcmp(tmp, "POSIX")==0)
-	      Locale = NULL;
-	    else
-	      Locale = tmp;
+
+    if (!Locale) {
+	Locale = getenv("LC_ALL");
     }
-    } else {
-	Locale = NULL;
-    }
-#endif
     if (!Locale) {
     	Locale = getenv("LANG");
     }
-    setlocale(LC_ALL, Locale);
+
+    setlocale(LC_ALL, "");
+
     if (!Locale || strcmp(Locale, "C")==0 || strcmp(Locale, "POSIX")==0) 
       Locale = NULL;
 #ifdef I18N
@@ -692,6 +680,7 @@ main(int argc, char **argv)
     if (!XSupportsLocale()) {
 	wwarning(_("X server does not support locale"));
     }
+
     if (XSetLocaleModifiers("") == NULL) {
  	wwarning(_("cannot set locale modifiers"));
     }
@@ -706,7 +695,6 @@ main(int argc, char **argv)
 	    *ptr = 0;
     }
 
-
     /* open display */
     dpy = XOpenDisplay(DisplayName);
     if (dpy == NULL) {

src/startup.c

@@ -626,6 +626,26 @@ wScreenForWindow(Window window)
 }
 
 
+static char *atomNames[] = {
+    "WM_STATE", 
+    "WM_CHANGE_STATE", 
+    "WM_PROTOCOLS", 
+    "WM_TAKE_FOCUS", 
+    "WM_DELETE_WINDOW", 
+    "WM_SAVE_YOURSELF", 
+    "WM_CLIENT_LEADER", 
+    "WM_COLORMAP_WINDOWS", 
+    "WM_COLORMAP_NOTIFY", 
+    GNUSTEP_WM_ATTR_NAME, 
+    "_WINDOWMAKER_MENU", 
+    "_WINDOWMAKER_STATE", 
+    "_WINDOWMAKER_WM_PROTOCOLS", 
+    GNUSTEP_WM_MINIATURIZE_WINDOW,
+    "_WINDOWMAKER_WM_FUNCTION",
+    "_WINDOWMAKER_NOTICEBOARD",
+    "_WINDOWMAKER_COMMAND"
+};
+
 
 /*
  *----------------------------------------------------------
@@ -643,6 +663,7 @@ StartUp(Bool defaultScreenOnly)
     WWorkspaceState *ws_state;
     struct sigaction sig_action;
     int j, max;
+    Atom atom[sizeof(atomNames)/sizeof(char*)];
 
     /*
      * Ignore CapsLock in modifiers
@@ -664,34 +685,34 @@ StartUp(Bool defaultScreenOnly)
 
 /*    _XA_VERSION = XInternAtom(dpy, "VERSION", False);*/
 
-    _XA_WM_STATE = XInternAtom(dpy, "WM_STATE", False);
-    _XA_WM_CHANGE_STATE = XInternAtom(dpy, "WM_CHANGE_STATE", False);
-    _XA_WM_PROTOCOLS = XInternAtom(dpy, "WM_PROTOCOLS", False);
-    _XA_WM_TAKE_FOCUS = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-    _XA_WM_DELETE_WINDOW = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-    _XA_WM_SAVE_YOURSELF = XInternAtom(dpy, "WM_SAVE_YOURSELF", False);    
-    _XA_WM_CLIENT_LEADER = XInternAtom(dpy, "WM_CLIENT_LEADER", False);
-    _XA_WM_COLORMAP_WINDOWS = XInternAtom(dpy, "WM_COLORMAP_WINDOWS", False);
-    _XA_WM_COLORMAP_NOTIFY = XInternAtom(dpy, "WM_COLORMAP_NOTIFY", False);
+    XInternAtoms(dpy, atomNames, sizeof(atomNames)/sizeof(char*),
+		 False, atom);
     
-    _XA_GNUSTEP_WM_ATTR = XInternAtom(dpy, GNUSTEP_WM_ATTR_NAME, False);
+    _XA_WM_STATE = atom[0];
+    _XA_WM_CHANGE_STATE = atom[1];
+    _XA_WM_PROTOCOLS = atom[2];
+    _XA_WM_TAKE_FOCUS = atom[3];
+    _XA_WM_DELETE_WINDOW = atom[4];
+    _XA_WM_SAVE_YOURSELF = atom[5];
+    _XA_WM_CLIENT_LEADER = atom[6];
+    _XA_WM_COLORMAP_WINDOWS = atom[7];
+    _XA_WM_COLORMAP_NOTIFY = atom[8];
 
-    _XA_WINDOWMAKER_MENU = XInternAtom(dpy, "_WINDOWMAKER_MENU", False);
-    _XA_WINDOWMAKER_STATE = XInternAtom(dpy, "_WINDOWMAKER_STATE", False);
+    _XA_GNUSTEP_WM_ATTR = atom[9];
 
-    _XA_WINDOWMAKER_WM_PROTOCOLS =
-	XInternAtom(dpy, "_WINDOWMAKER_WM_PROTOCOLS", False);
+    _XA_WINDOWMAKER_MENU = atom[10];
+    _XA_WINDOWMAKER_STATE = atom[11];
 
-    _XA_GNUSTEP_WM_MINIATURIZE_WINDOW = 
-	XInternAtom(dpy, GNUSTEP_WM_MINIATURIZE_WINDOW, False);
+    _XA_WINDOWMAKER_WM_PROTOCOLS = atom[12];
 
-    _XA_WINDOWMAKER_WM_FUNCTION = XInternAtom(dpy, "_WINDOWMAKER_WM_FUNCTION",
-					      False);
+    _XA_GNUSTEP_WM_MINIATURIZE_WINDOW = atom[13];
     
-    _XA_WINDOWMAKER_NOTICEBOARD = XInternAtom(dpy, "_WINDOWMAKER_NOTICEBOARD",
-					      False);
+    _XA_WINDOWMAKER_WM_FUNCTION = atom[14];
+
+    _XA_WINDOWMAKER_NOTICEBOARD = atom[15];
+    
+    _XA_WINDOWMAKER_COMMAND = atom[16];
 
-    _XA_WINDOWMAKER_COMMAND = XInternAtom(dpy, "_WINDOWMAKER_COMMAND", False);
 
 #ifdef OFFIX_DND
     _XA_DND_SELECTION = XInternAtom(dpy, "DndSelection", False);
@@ -857,7 +878,8 @@ StartUp(Bool defaultScreenOnly)
 	if (ws_state == NULL)
 	    wSessionRestoreState(wScreen[j]);
 	
-	
+if(!wPreferences.flags.noautolaunch)
+{
 	/* auto-launch apps */
 	if (!wPreferences.flags.nodock && wScreen[j]->dock) {
 	    wScreen[j]->last_dock = wScreen[j]->dock;
@@ -873,6 +895,7 @@ StartUp(Bool defaultScreenOnly)
 		}
 	    }
 	}
+}
 
 	/* go to workspace where we were before restart */
 	if (ws_state) { 

src/wconfig.h.in

@@ -178,15 +178,19 @@
 #undef IGNORE_PPOSITION
 
 
+/*
+ * Do not scale application icon and miniwindow icon images.
+ */
+#undef DONT_SCALE_ICONS
+
+
+
+
+
+
 #define SILLYNESS
 
 
-/*
- * Define if you're experiencing crashes when launching programs.
- * This will disable some important but not essential code.
- * Use it until we figure what's wrong.
- */
-#undef NO_CRASHES
 
 
 

src/winspector.c

@@ -1102,7 +1102,8 @@ selectSpecification(WMWidget *bPtr, void *data)
     char *str;
     WWindow *wwin = panel->inspected;
 
-    if (bPtr == panel->defaultRb) {
+
+    if (bPtr == panel->defaultRb && (wwin->wm_instance || wwin->wm_class)) {
 	WMSetButtonEnabled(panel->applyBtn, False);
     } else {
 	WMSetButtonEnabled(panel->applyBtn, True);
@@ -1303,9 +1304,6 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
 	WMSetButtonAction(panel->clsRb, selectSpecification, panel);
     }
 
-    if (selectedBtn)
-        WMSetButtonSelected(selectedBtn, True);
-
     
     panel->selWinB = WMCreateCommandButton(panel->specFrm);
     WMMoveWidget(panel->selWinB, 20, 145-24 - 10);

util/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -44,9 +44,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -222,8 +223,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -388,7 +389,7 @@ uninstall: uninstall-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)