switch from CVS to SVN

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@724 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

aclocal.m4

@@ -224,7 +224,7 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_LIB_PROG_LD_GNU
 ])
 
-# lib-link.m4 serial 8 (gettext-0.15)
+# lib-link.m4 serial 9 (gettext-0.16)
 dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -424,9 +424,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -446,9 +453,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi

widget_timer.c

@@ -68,7 +68,7 @@ void widget_timer_update(void *Self)
     WIDGET *W = (WIDGET *) Self;
     WIDGET_TIMER *Timer = W->data;
     int update, active;
-    
+
     /* evaluate expressions */
     property_eval(&Timer->update);
     property_eval(&Timer->active);
@@ -77,7 +77,7 @@ void widget_timer_update(void *Self)
     update = P2N(&Timer->update);
     if (update < 10)
 	update = 10;
-    
+
     /* finally, fire it! */
     active = P2N(&Timer->active);
     if (active > 0) {

widget_timer.h

@@ -43,9 +43,9 @@
 
 
 typedef struct WIDGET_TIMER {
-    PROPERTY expression; /* main timer expression */
-    PROPERTY update; /* update interval (msec) */
-    PROPERTY active; /* timer active? */
+    PROPERTY expression;	/* main timer expression */
+    PROPERTY update;		/* update interval (msec) */
+    PROPERTY active;		/* timer active? */
 } WIDGET_TIMER;
 
 extern WIDGET_CLASS Widget_Timer;