| 1 | diff --git a/configure.ac b/configure.ac
|
| 2 | index 997c0d6..9030642 100644
|
| 3 | |
| 4 | |
| 5 | @@ -135,6 +135,9 @@ PKG_PROG_PKG_CONFIG
|
| 6 | PKG_CHECK_MODULES([TINYXML], [tinyxml], [HAVE_TINYXML=yes], [HAVE_TINYXML=no])
|
| 7 | AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes])
|
| 8 |
|
| 9 | +PKG_CHECK_MODULES([NSPR], [nspr >= 4.0], [HAVE_SYSTEM_NSPR=yes], [HAVE_SYSTEM_NSPR=no])
|
| 10 | +AM_CONDITIONAL([HAVE_SYSTEM_NSPR], [test "$HAVE_SYSTEM_NSPR" = yes])
|
| 11 | +
|
| 12 | dnl Darwin -> .dylib Linux -> .so
|
| 13 | if test "x$DARWIN_TRUE" = "x" ; then
|
| 14 | MODULE_SHARED_LDFLAGS="-dynamiclib"
|
| 15 | @@ -342,10 +345,20 @@ else
|
| 16 | CB_TINYXML_LIBS="\$(top_builddir)/src/base/tinyxml/libtinyxml.la"
|
| 17 | fi
|
| 18 |
|
| 19 | +if test "x$HAVE_SYSTEM_NSPR" = "xyes" ; then
|
| 20 | + CB_NSPR_CFLAGS="$NSPR_CFLAGS"
|
| 21 | + CB_NSPR_LIBS="$NSPR_LIBS"
|
| 22 | +else
|
| 23 | + CB_NSPR_CFLAGS="-I\$(top_srcdir)/src/sdk/mozilla_chardet/include/nsprpub/pr/include"
|
| 24 | + CB_NSPR_LIBS=""
|
| 25 | +fi
|
| 26 | +
|
| 27 | AC_SUBST(CB_SQUIRREL_CFLAGS)
|
| 28 | AC_SUBST(CB_SQUIRREL_LIBS)
|
| 29 | AC_SUBST(CB_TINYXML_CFLAGS)
|
| 30 | AC_SUBST(CB_TINYXML_LIBS)
|
| 31 | +AC_SUBST(CB_NSPR_CFLAGS)
|
| 32 | +AC_SUBST(CB_NSPR_LIBS)
|
| 33 | AC_SUBST(WX_GTK_CFLAGS)
|
| 34 | AC_SUBST(WX_GTK_LIBS)
|
| 35 | AC_SUBST(SCINTILLA_GTK_CFLAGS)
|
| 36 | diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am
|
| 37 | index ae746be..cd7917c 100644
|
| 38 | |
| 39 | |
| 40 | @@ -8,7 +8,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
|
| 41 | -I$(top_srcdir)/src/sdk/wxscintilla/include \
|
| 42 | -I$(top_srcdir)/src/sdk/mozilla_chardet/include \
|
| 43 | -I$(top_srcdir)/src/sdk/mozilla_chardet/include/mfbt \
|
| 44 | - -I$(top_srcdir)/src/sdk/mozilla_chardet/include/nsprpub/pr/include \
|
| 45 | + $(CB_NSPR_CFLAGS) \
|
| 46 | -I$(top_srcdir)/src/sdk/mozilla_chardet/include/xpcom \
|
| 47 | -I$(top_srcdir)/src/sdk/mozilla_chardet/include/xpcom/base \
|
| 48 | -I$(top_srcdir)/src/sdk/mozilla_chardet/include/xpcom/glue
|
| 49 | @@ -27,7 +27,8 @@ libcodeblocks_la_LIBADD = scripting/bindings/libsqbindings.la \
|
| 50 | $(SCINTILLA_GTK_LIBS) \
|
| 51 | $(CB_GLIB2_LIBS) \
|
| 52 | $(CB_TINYXML_LIBS) \
|
| 53 | - $(CB_SQUIRREL_LIBS)
|
| 54 | + $(CB_SQUIRREL_LIBS) \
|
| 55 | + $(CB_NSPR_LIBS)
|
| 56 |
|
| 57 | if CODEBLOCKS_NT
|
| 58 | libcodeblocks_la_LIBADD += -lgdi32
|