diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2015-08-23 07:03:34 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-08-23 07:03:34 +0000 |
| commit | cc324ba00091f187d237a38241c6687a18a75d6b (patch) | |
| tree | fe1fd164763dc391f488b084f41ba71e1f465cf4 | |
| parent | Simplify a bit BSpline code (diff) | |
| download | inkscape-cc324ba00091f187d237a38241c6687a18a75d6b.tar.gz inkscape-cc324ba00091f187d237a38241c6687a18a75d6b.zip | |
Remove remnants of r4454 (ige-mac-menu), no longer needed after r10950.
(bzr r14317)
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index aeda9981d..79346551e 100644 --- a/configure.ac +++ b/configure.ac @@ -899,21 +899,6 @@ if test "x$enable_strict_build" = "xhigh"; then CPPFLAGS="-Werror=deprecated-declarations $CPPFLAGS" fi -# Check for Apple Mac OS X Carbon framework -carbon_ok=no -AC_MSG_CHECKING([for Mac OS X Carbon support]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <Carbon/Carbon.h> -#include <CoreServices/CoreServices.h>]], []) -], [carbon_ok=yes]) -AC_MSG_RESULT($carbon_ok) -if test "x$carbon_ok" = "xyes"; then - AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) - CARBON_LDFLAGS="-framework Carbon" - AC_SUBST(CARBON_LDFLAGS) -fi -AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes") - # Check for some boost header files AC_CHECK_HEADERS([boost/concept_check.hpp], [], AC_MSG_ERROR([You need the boost package (e.g. libboost-dev)])) diff --git a/src/Makefile.am b/src/Makefile.am index 7a37f13e8..04e33c471 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,6 @@ all_libs = \ $(FREETYPE_LIBS) \ $(kdeldadd) \ $(win32ldflags) \ - $(CARBON_LDFLAGS) \ $(LIBWPG_LIBS) \ $(LIBVISIO_LIBS) \ $(LIBCDR_LIBS) \ |