Revision: 4482 http://geany.svn.sourceforge.net/geany/?rev=4482&view=rev Author: ntrel Date: 2009-12-08 16:06:57 +0000 (Tue, 08 Dec 2009)

Log Message: ----------- Apply patch from Eugene Arshinov to detect libSM (X session management library, thanks).

Modified Paths: -------------- branches/sm/ChangeLog branches/sm/configure.in branches/sm/src/Makefile.am branches/sm/wscript

Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2009-12-08 13:04:35 UTC (rev 4481) +++ branches/sm/ChangeLog 2009-12-08 16:06:57 UTC (rev 4482) @@ -1,5 +1,12 @@ 2009-12-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

+ * src/Makefile.am, configure.in, wscript: + Apply patch from Eugene Arshinov to detect libSM (X session management + library, thanks). + + +2009-12-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * src/filetypes.c, src/filetypes.h: Make group for custom filetypes. * data/filetypes.Genie.conf, data/filetype_extensions.conf:

Modified: branches/sm/configure.in =================================================================== --- branches/sm/configure.in 2009-12-08 13:04:35 UTC (rev 4481) +++ branches/sm/configure.in 2009-12-08 16:06:57 UTC (rev 4482) @@ -249,6 +249,26 @@ fi

+# libSM for X session management +SM_LIBS="" +AC_ARG_ENABLE(libsm, + [ --enable-libsm enable X session management support [[]]], + [enable_libsm=$enableval], [enable_libsm=yes]) +AC_MSG_CHECKING([whether to use LibSM]) +if test x"$enable_libsm" = xyes; then + AC_MSG_RESULT(yes) + AC_CHECK_HEADERS(X11/SM/SMlib.h, [SM_LIBS="-lSM -lICE"], enable_libsm=no) + if test x"$enable_libsm" = xyes; then + AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed]) + else + AC_MSG_WARN([X session management will not be supported]) + fi +else + AC_MSG_RESULT(no) +fi +AC_SUBST(SM_LIBS) + + # Set ${datadir} if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then if test "x${prefix}" = "xNONE"; then @@ -292,20 +312,21 @@ ])

echo "----------------------------------------" -echo "Install Geany in : ${prefix}" +echo "Install Geany in : ${prefix}" if test "x${build}" != "x" -a "x${target}" != "x" then - echo "Building Geany on : ${build}" - echo "Building Geany for : ${target}" + echo "Building Geany on : ${build}" + echo "Building Geany for : ${target}" fi -echo "Using GTK version : ${GTK_VERSION}" -echo "Build with GTK printing support : ${enable_printing}" -echo "Build with plugin support : ${enable_plugins}" -echo "Use virtual terminal support : ${want_vte}" -echo "Use (UNIX domain) socket support : ${want_socket}" +echo "Using GTK version : ${GTK_VERSION}" +echo "Build with GTK printing support : ${enable_printing}" +echo "Build with plugin support : ${enable_plugins}" +echo "Build with X session management support : ${enable_libsm}" +echo "Use virtual terminal support : ${want_vte}" +echo "Use (UNIX domain) socket support : ${want_socket}" if test "${REVISION}" != "-1" then - echo "Compiling Subversion revision : ${REVISION}" + echo "Compiling Subversion revision : ${REVISION}" fi echo "" echo "Configuration is done OK."

Modified: branches/sm/src/Makefile.am =================================================================== --- branches/sm/src/Makefile.am 2009-12-08 13:04:35 UTC (rev 4481) +++ branches/sm/src/Makefile.am 2009-12-08 16:06:57 UTC (rev 4482) @@ -110,7 +110,7 @@

geany_SOURCES = $(SRCS) vte.c vte.h

-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ @SM_LIBS@ $(INTLLIBS)

AM_CFLAGS = -DGEANY_DATADIR=""$(datadir)"" \ -DGEANY_DOCDIR=""$(docdir)"" \

Modified: branches/sm/wscript =================================================================== --- branches/sm/wscript 2009-12-08 13:04:35 UTC (rev 4481) +++ branches/sm/wscript 2009-12-08 16:06:57 UTC (rev 4482) @@ -211,6 +211,12 @@ gtk_version = 'Unknown' conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=False)

+ # Find libSM + if not Options.options.no_libsm: + sm_version = conf.check_cfg(package='sm', uselib_store='SM', args='--cflags --libs', mandatory=False) + if sm_version is None: + Options.options.no_libsm = True + # Windows specials if is_win32: if conf.env['PREFIX'] == tempfile.gettempdir(): @@ -259,6 +265,7 @@ conf_define_from_opt('HAVE_PLUGINS', not Options.options.no_plugins, None, 0) conf_define_from_opt('HAVE_SOCKET', not Options.options.no_socket, None, 0) conf_define_from_opt('HAVE_VTE', not Options.options.no_vte, None, 0) + conf_define_from_opt('HAVE_LIBSM', not Options.options.no_libsm, None, 0)

conf.write_config_header('config.h')

@@ -267,6 +274,7 @@ print_message(conf, 'Using GTK version', gtk_version) print_message(conf, 'Build with GTK printing support', have_gtk_210 and 'yes' or 'no') print_message(conf, 'Build with plugin support', Options.options.no_plugins and 'no' or 'yes') + print_message(conf, 'Build with X session management support', Options.options.no_libsm and 'no' or 'yes') print_message(conf, 'Use virtual terminal support', Options.options.no_vte and 'no' or 'yes') if svn_rev != '-1': print_message(conf, 'Compiling Subversion revision', svn_rev) @@ -295,6 +303,9 @@ opt.add_option('--disable-vte', action='store_true', default=target_is_win32(os.environ), help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte') + opt.add_option('--disable-libsm', action='store_true', default=target_is_win32(os.environ), + help='compile without X session management support [[default: No]', + dest='no_libsm') opt.add_option('--enable-gnu-regex', action='store_true', default=False, help='compile with included GNU regex library [default: No]', dest='gnu_regex') # Paths @@ -370,7 +381,7 @@ target = 'geany', source = geany_sources, includes = '. src/ scintilla/include/ tagmanager/include/', - uselib = 'GTK GIO WIN32', + uselib = 'GTK GIO SM WIN32', uselib_local = 'scintilla tagmanager', add_objects = 'geany-rc' if is_win32 else None )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.