--- linuxwacom-0.8.2.orig/configure.in 2008-12-01 19:24:20.000000000 -0500
+++ linuxwacom-0.8.2/configure.in 2008-12-16 00:09:51.221790503 -0500
@@ -299,7 +299,9 @@
dnl =======================================================
dnl Check for Xlib
-WCM_CLEVEL=-ansi
+if test "$GCC" = yes; then
+ WCM_CLEVEL=-ansi
+fi
WCM_ENV_XLIB=no
WCM_ENV_XF86CONFIG=no
WCM_XLIB_DIR=
@@ -610,7 +612,10 @@
1.0*|1.1*|1.2*|1.3*)
;;
1.*|2*)
- WCM_CLEVEL=-std=c99;;
+ if test "$GCC" = yes; then
+ WCM_CLEVEL=-std=c99
+ fi
+ ;;
*)
;;
esac
@@ -945,7 +950,7 @@
WCM_DEPFLAGS=
AC_ARG_ENABLE(mkxincludes,
AC_HELP_STRING([--enable-mkxincludes], [Enable mkxincludes, XFree86 dependency builder [[default=no]]]),
- [ test "$enable_mkxincludes" = yes && WCM_DEPFLAGS="-MMD" ])
+ [ test "$enable_mkxincludes" = yes && test "$GCC" = "yes" && WCM_DEPFLAGS="-MMD" ])
dnl =======================================================
dnl Check for compiler flags if using gcc
--- linuxwacom-0.8.2.orig/src/util/Makefile.am 2008-12-01 19:24:20.000000000 -0500
+++ linuxwacom-0.8.2/src/util/Makefile.am 2008-12-15 23:50:44.397476201 -0500
@@ -12,7 +12,7 @@
WACOMCFG_INCLUDES = -I$(WCM_XFREE86_DIR)
endif
-AM_CFLAGS = -Wall -pedantic $(WACOMCFG_INCLUDES)
+AM_CFLAGS = $(WACOMCFG_INCLUDES)
# These identify which programs, libraries, and headers could
# potentially be built or installed depending on the results of
--- linuxwacom-0.8.2.orig/src/wacomxi/Makefile.am 2008-12-01 19:24:20.000000000 -0500
+++ linuxwacom-0.8.2/src/wacomxi/Makefile.am 2008-12-15 23:51:00.255460685 -0500
@@ -1,4 +1,4 @@
-AM_CFLAGS = -Wall
+AM_CFLAGS =
# WacomXI Install
if WACOMXI_INSTALL
--- linuxwacom-0.8.2.orig/src/xdrv/Makefile.am 2008-12-01 19:24:20.000000000 -0500
+++ linuxwacom-0.8.2/src/xdrv/Makefile.am 2008-12-16 00:22:00.926949675 -0500
@@ -45,14 +45,14 @@
$(XF86OBJS):
$(CC) $(CFLAGS) $(WCM_DEPFLAGS) $(DLLOADER) -pipe $(WCM_CLEVEL) \
- -pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
+ $(NO_MERGE_CONSTANTS) \
$(NO_STACK_PROTECTOR) -I$(srcdir) $(DRIVER_INCLUDES) \
$(WCM_XSERVER64) $(XSERVER_CFLAGS) \
-o $@ -c $(srcdir)/$(subst .o,.c,$@)
if WCM_DLLOADER
wacom_drv.so: .depend $(XF86OBJS)
- $(CC) -shared -nostdlib -o wacom_drv.so $(XF86OBJS) -Bstatic -lgcc
+ $(CC) $(CFLAGS) -shared -nostdlib -o wacom_drv.so $(XF86OBJS) -Bstatic
else
wacom_drv.o: .depend $(XF86OBJS)
$(LD) -r $(XF86OBJS) -o wacom_drv.o
@@ -61,8 +61,7 @@
depend: .depend
.depend: Makefile
- @rm -f .depend
- $(CC) -MM $(CFLAGS) $(DEPFLAGS) $(DRIVER_INCLUDES) $(XF86OBJS:%.o=$(srcdir)/%.c) > .depend
+ @touch .depend
-include .depend