Apply patch from Shiv to make build system more compatible with other compilers than gcc.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1689 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2007-07-11  Enrico Tröger  <enrico.troeger@uvena.de>
+
+ * THANKS, configure.in, plugins/Makefile.am, scintilla/Makefile.am,
+   src/Makefile.am, tagmanager/Makefile.am:
+   Apply patch from Shiv to make build system more compatible with other
+   compilers than gcc.
+
+
 2007-07-11  Nick Treleaven  <nick.treleaven@btinternet.com>
 
  * src/highlighting.c:

THANKS

@@ -32,6 +32,7 @@ Peter Strand <peter(at)zarquon(dot)se> - Haskell CTags patch
 Dave Moore <wrex006(at)gmail(dot)com> - code navigation patch
 François Cami <francois.cami(at)free(dot)fr>, Guillaume Duviol - tab replacement patch
 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com> - class builder patch
+Shiv <shivakumar(dot)gn(at)gmail(dot)com> - Sun Studio compiler compatibility patch
 
 Translators:
 ----------------------------------

configure.in

@@ -9,6 +9,8 @@ AM_CONFIG_HEADER(config.h)
 
 AC_ISC_POSIX
 AC_PROG_CC
+AM_CONDITIONAL(IS_COMPILER_GCC,test x$CC = xgcc)
+
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_PROG_CXX

plugins/Makefile.am

@@ -3,7 +3,11 @@
 #EXTRA_DIST = \
 	#makefile.win32
 
-AM_CFLAGS = -Wall
+if IS_COMPILER_GCC
+    AM_CFLAGS = -Wall -pipe
+else
+    AM_CFLAGS =
+endif
 
 plugindir = $(libdir)/geany
 

scintilla/Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = include
 
 noinst_LIBRARIES=libscintilla.a
 
-CC=g++
+CC = @CC@
 
 AM_CXXFLAGS = -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE
 
@@ -99,7 +99,7 @@ endif
 libscintilla_a_LIBADD = scintilla-marshal.o
 
 scintilla-marshal.o: scintilla-marshal.c
-	gcc @GTK_CFLAGS@ -c $(srcdir)/scintilla-marshal.c
+	$(CC) @GTK_CFLAGS@ -c $(srcdir)/scintilla-marshal.c
 
 marshallers: scintilla-marshal.list
 	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h

src/Makefile.am

@@ -60,9 +60,19 @@ clean-local:
 
 else
 # build Geany for all other platforms
-AM_CFLAGS = -Wall -pipe
+if IS_COMPILER_GCC
+    AM_CFLAGS = -Wall -pipe
+else
+    AM_CFLAGS =
+endif
+
 geany_SOURCES = $(SRCS) vte.c vte.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lstdc++ $(INTLLIBS)
+
+if IS_COMPILER_GCC
+    geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lstdc++ $(INTLLIBS)
+else
+    geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lCrun $(INTLLIBS)
+endif
 
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -70,4 +80,5 @@ INCLUDES = \
 
 clean-local:
 
+
 endif

tagmanager/Makefile.am

@@ -7,7 +7,11 @@ INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS)
 #	-DGDK_PIXBUF_DEPRECATED \
 #	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
 
-AM_CFLAGS = -Wall
+if IS_COMPILER_GCC
+    AM_CFLAGS = -Wall -pipe
+else
+    AM_CFLAGS =
+endif
 
 noinst_LIBRARIES = libtagmanager.a
 libtagmanager_a_SOURCES =\