Revision: 5839 http://geany.svn.sourceforge.net/geany/?rev=5839&view=rev Author: colombanw Date: 2011-06-13 18:41:15 +0000 (Mon, 13 Jun 2011)
Log Message: ----------- Dump dependencies to GTK >= 2.12, GLib >= 2.16 and GIO
Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/Makefile.am trunk/src/makefile.win32 trunk/wscript
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-06-10 23:13:08 UTC (rev 5838) +++ trunk/ChangeLog 2011-06-13 18:41:15 UTC (rev 5839) @@ -1,3 +1,9 @@ +2011-06-13 Colomban Wendling <colomban(at)geany(dot)org> + + * configure.ac, src/Makefile.am, src/makefile.win32, wscript: + Dump dependencies to GTK >= 2.12, GLib >= 2.16 and GIO. + + 2011-06-11 Colomban Wendling <colomban(at)geany(dot)org>
* src/dialogs.c, src/main.c, src/ui_utils.h:
Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-06-10 23:13:08 UTC (rev 5838) +++ trunk/configure.ac 2011-06-13 18:41:15 UTC (rev 5839) @@ -133,19 +133,13 @@ fi
-# GTK checks -gtk_modules="gtk+-2.0 >= 2.8.0" +# GTK/GLib/GIO checks +gtk_modules="gtk+-2.0 >= 2.12 glib-2.0 >= 2.16 gio-2.0 >= 2.16" PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -# GIO checks -gio_modules="gio-2.0 >= 2.16" -PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) -AC_SUBST(GIO_CFLAGS) -AC_SUBST(GIO_LIBS) -if test $have_gio = 1 ; then - AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) -fi +# currently define it, but we will be able to drop the checks now we hard-depend on it +AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) # GTHREAD checks gthread_modules="gthread-2.0" PKG_CHECK_MODULES(GTHREAD, [$gthread_modules])
Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2011-06-10 23:13:08 UTC (rev 5838) +++ trunk/src/Makefile.am 2011-06-13 18:41:15 UTC (rev 5839) @@ -74,7 +74,7 @@
INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \ - -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@ + -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GTHREAD_CFLAGS@
# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -86,7 +86,7 @@ geany_SOURCES = $(SRCS) win32.c win32.h
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GIO_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ + @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ geany_private.res
AM_CFLAGS = -DGEANY_DATADIR="data" \ @@ -114,7 +114,7 @@ geany_SOURCES = $(SRCS) vte.c vte.h
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GIO_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) + @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS)
AM_CFLAGS = -DGEANY_DATADIR=""$(datadir)"" \ -DGEANY_DOCDIR=""$(docdir)"" \
Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2011-06-10 23:13:08 UTC (rev 5838) +++ trunk/src/makefile.win32 2011-06-13 18:41:15 UTC (rev 5839) @@ -39,19 +39,14 @@ ALL_GTK_LIBS= \ -L"$(PREFIX)/lib" \ -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lgthread-2.0 -lintl + -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lgthread-2.0 -lintl \ + -lcairo -lpangocairo-1.0 -lgio-2.0 # these things are for GTK >= 2.8 # (should be same as with MSYS: pkg-config --libs gtk+-2.0 gthread-2.0) #"$(PREFIX)/lib/libcairo.dll.a" \ #"$(PREFIX)/lib/asprintf.lib" \ #"$(PREFIX)/lib/charset.lib" \
-ifdef GTK280 -ALL_GTK_LIBS +=-liconv -else -ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0 -lgio-2.0 -endif - WIN_LIBS=-mwindows -lole32 -luuid -liberty -lwsock32
CBASEFLAGS=-Wall -pipe -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-06-10 23:13:08 UTC (rev 5838) +++ trunk/wscript 2011-06-13 18:41:15 UTC (rev 5839) @@ -141,17 +141,13 @@ _load_intltool_if_available(conf)
# GTK / GIO version check - conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', + conf.check_cfg(package='gtk+-2.0', atleast_version='2.12.0', uselib_store='GTK', mandatory=True, args='--cflags --libs') - have_gtk_210 = False - gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') - if gtk_version: - if version.LooseVersion(gtk_version) >= version.LooseVersion('2.10.0'): - have_gtk_210 = True - else: - gtk_version = 'Unknown' + conf.check_cfg(package='glib-2.0', atleast_version='2.16.0', uselib_store='GLIB', + mandatory=True, args='--cflags --libs') + conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=True) + gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') or 'Unknown' conf.check_cfg(package='gthread-2.0', uselib_store='GTHREAD', args='--cflags --libs') - conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=False)
# Windows specials if is_win32: @@ -220,7 +216,6 @@ Logs.pprint('BLUE', 'Summary:') conf.msg('Install Geany ' + VERSION + ' in', conf.env['PREFIX']) conf.msg('Using GTK version', gtk_version) - conf.msg('Build with GTK printing support', have_gtk_210 and 'yes' or 'no') conf.msg('Build with plugin support', conf.options.no_plugins and 'no' or 'yes') conf.msg('Use virtual terminal support', conf.options.no_vte and 'no' or 'yes') conf.msg('GNU regex library', conf.env['USE_INCLUDED_REGEX'] and 'built-in' or 'system') @@ -276,7 +271,7 @@ includes = ['.', 'src/', 'scintilla/include', 'tagmanager/include'], defines = 'G_LOG_DOMAIN="%s"' % plugin_name, target = plugin_name, - uselib = 'GTK', + uselib = ['GTK', 'GLIB'], install_path = instpath)
@@ -290,7 +285,7 @@ target = 'tagmanager', includes = ['.', 'tagmanager', 'tagmanager/include'], defines = 'G_LOG_DOMAIN="Tagmanager"', - uselib = 'GTK', + uselib = ['GTK', 'GLIB'], install_path = None) # do not install this library
@@ -302,7 +297,7 @@ target = 'mio', includes = ['.', 'tagmanager/mio/'], defines = 'G_LOG_DOMAIN="MIO"', - uselib = 'GTK', + uselib = ['GTK', 'GLIB'], install_path = None) # do not install this library
@@ -333,7 +328,7 @@ source = geany_sources, includes = ['.', 'scintilla/include/', 'tagmanager/include/'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], - uselib = ['GTK', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'], + uselib = ['GTK', 'GLIB', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'], use = ['scintilla', 'tagmanager', 'mio'])
# geanyfunctions.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.