Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Wed, 15 Apr 2015 12:01:40 UTC Commit: a98c9d50843911340f89b17db5bf707aa00557c2 https://github.com/geany/geany/commit/a98c9d50843911340f89b17db5bf707aa00557...

Log Message: ----------- Merge pull request #468 from techee/link_warning

Compile prefix.c and osx.c only when needed to avoid warnings

Modified Paths: -------------- m4/geany-binreloc.m4 m4/geany-mac-integration.m4 src/Makefile.am

Modified: m4/geany-binreloc.m4 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -52,9 +52,11 @@ AC_DEFUN([GEANY_CHECK_BINRELOC], AC_MSG_RESULT([no (unknown value "$enable_binreloc")]) enable_binreloc=no fi - if test "$enable_binreloc" = "yes"; then + AM_CONDITIONAL(ENABLE_BINRELOC, [test "$enable_binreloc" = "yes"]) + AM_COND_IF(ENABLE_BINRELOC, + [ AC_DEFINE([ENABLE_BINRELOC],,[Use AutoPackage?]) - fi + ])

GEANY_STATUS_ADD([Enable binary relocation], [$enable_binreloc]) ])

Modified: m4/geany-mac-integration.m4 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,8 @@ AC_DEFUN([GEANY_CHECK_MAC_INTEGRATION], [geany_enable_mac_integration="$enableval"], [geany_enable_mac_integration="no"])

- AS_IF([test "x$geany_enable_mac_integration" = "xyes"], + AM_CONDITIONAL(ENABLE_MAC_INTEGRATION, [test "x$geany_enable_mac_integration" = "xyes"]) + AM_COND_IF(ENABLE_MAC_INTEGRATION, [ AS_IF([test "x$enable_gtk3" = xyes], [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk3)],

Modified: src/Makefile.am 10 lines changed, 8 insertions(+), 2 deletions(-) =================================================================== @@ -81,10 +81,8 @@ libgeany_la_SOURCES = \ msgwindow.c msgwindow.h \ navqueue.c navqueue.h \ notebook.c notebook.h \ - osx.c osx.h \ plugins.c plugins.h \ pluginutils.c pluginutils.h \ - prefix.c prefix.h \ prefs.c prefs.h \ printing.c printing.h \ project.c project.h \ @@ -101,6 +99,14 @@ libgeany_la_SOURCES = \ ui_utils.c ui_utils.h \ utils.c utils.h

+if ENABLE_BINRELOC +libgeany_la_SOURCES += prefix.c prefix.h +endif + +if ENABLE_MAC_INTEGRATION +libgeany_la_SOURCES += osx.c osx.h +endif + libgeany_la_CFLAGS = $(AM_CPPFLAGS) @LIBGEANY_CFLAGS@ libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).