#ifdef i386Architecture
-# define OptimizedCDebugFlags -O2
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 -fno-strict-aliasing
+# endif
# if OSMajorVersion < 1
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
# else
# define ServerExtraSysLibs -li386
# endif
#else
-# define OptimizedCDebugFlags -O2
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 -fno-strict-aliasing
+# endif
# if defined(SparcArchitecture)
# define ServerOSDefines -DDDXOSINIT
# else
# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) -Wl,-rpath,$(USRLIBDIRPATH)
#endif
+#ifndef SharedDtHelpReqs
+# define SharedDtHelpReqs $(LDPRELIBS) $(ICONVSYSLIB) SharedXReqs -Wl,-rpath,$(USRLIBDIRPATH)
+#endif
+
#ifndef SharedCsaReqs
# define SharedCsaReqs -lXt $(LDPOSTLIBS) -Wl,-rpath,$(USRLIBDIRPATH)
#endif