projects
/
app.Builder.js
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
571a6fe
)
configure.ac
author
Alan Knowles
<alan@roojs.com>
Tue, 28 Apr 2015 08:28:15 +0000
(16:28 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 28 Apr 2015 08:28:15 +0000
(16:28 +0800)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
0b0e0c7
..
14ab8cd
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-19,7
+19,7
@@
dnl we need to check these exist, then it will generate a compile string for the
PKG_CHECK_MODULES(BUILDER, [
glib-2.0 >= 2.24.1
PKG_CHECK_MODULES(BUILDER, [
glib-2.0 >= 2.24.1
- gobject-2.0 >= 2.24.1
+
gobject-2.0 >= 2.24.1
gtk+-3.0
gtksourceview-3.0
libxml-2.0
gtk+-3.0
gtksourceview-3.0
libxml-2.0
@@
-29,7
+29,7
@@
PKG_CHECK_MODULES(BUILDER, [
clutter-gtk-1.0
gladeui-2.0
libsoup-2.4
clutter-gtk-1.0
gladeui-2.0
libsoup-2.4
- libgda-5.0
+ libgda-5.0
])
])
@@
-37,23
+37,23
@@
dnl --- libvala -- needs to find matching really..
PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
- [vala_2_8_enabled=yes],
- [vala_2_8_enabled=no])
-
+
[vala_2_8_enabled=yes],
+
[vala_2_8_enabled=no])
+
if test $vala_2_8_enabled = yes; then
if test $vala_2_8_enabled = yes; then
- AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
+
AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
else
else
- PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
- [vala_2_6_enabled=yes],
- [vala_2_6_enabled=no])
-
- if test $vala_2_6_enabled = yes; then
- AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
+
PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
+
[vala_2_6_enabled=yes],
+
[vala_2_6_enabled=no])
+
+
if test $vala_2_6_enabled = yes; then
+
AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
else
PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
else
PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
- [vala_2_4_enabled=yes],
- [vala_2_4_enabled=no])
-
+
[vala_2_4_enabled=yes],
+
[vala_2_4_enabled=no])
+
if test $vala_2_4_enabled = yes; then
AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support])
else
if test $vala_2_4_enabled = yes; then
AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support])
else
@@
-70,22
+70,22
@@
AM_CONDITIONAL(HAVE_LIBVALA26, test "$vala_2_6_enabled" = "yes")
AM_CONDITIONAL(HAVE_LIBVALA24, test "$vala_2_4_enabled" = "yes")
AM_CONDITIONAL(HAVE_LIBVALA22, test "$vala_2_2_enabled" = "yes")
AM_CONDITIONAL(HAVE_LIBVALA24, test "$vala_2_4_enabled" = "yes")
AM_CONDITIONAL(HAVE_LIBVALA22, test "$vala_2_2_enabled" = "yes")
-
+
dnl --- gda
PKG_CHECK_MODULES(GDA, [libgda-5.0],
dnl --- gda
PKG_CHECK_MODULES(GDA, [libgda-5.0],
- [gda_5_0_enabled=yes],
- [gda_5_0_enabled=no])
+
[gda_5_0_enabled=yes],
+
[gda_5_0_enabled=no])
if test $gda_5_0_enabled = yes; then
if test $gda_5_0_enabled = yes; then
- AC_DEFINE(HAVE_GDA5,1,[libgda 5.0 support])
+
AC_DEFINE(HAVE_GDA5,1,[libgda 5.0 support])
else
else
- PKG_CHECK_MODULES(GDA, [libgda-4.0],
- [gda_4_0_enabled=yes] )
- AC_DEFINE(HAVE_GDA4,1,[libgda 4.0 support])
+
PKG_CHECK_MODULES(GDA, [libgda-4.0],
+
[gda_4_0_enabled=yes] )
+
AC_DEFINE(HAVE_GDA4,1,[libgda 4.0 support])
fi
AM_CONDITIONAL(HAVE_GDA4, test "$gda_4_0_enabled" = "yes")
AM_CONDITIONAL(HAVE_GDA5, test "$gda_5_0_enabled" = "yes")
fi
AM_CONDITIONAL(HAVE_GDA4, test "$gda_4_0_enabled" = "yes")
AM_CONDITIONAL(HAVE_GDA5, test "$gda_5_0_enabled" = "yes")
@@
-95,16
+95,16
@@
dnl -- webkit-4.0
PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-4.0],
PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-4.0],
- [webkit_4_0_enabled=yes],
- [webkit_4_0_enabled=no])
+
[webkit_4_0_enabled=yes],
+
[webkit_4_0_enabled=no])
if test $webkit_4_0_enabled = yes; then
if test $webkit_4_0_enabled = yes; then
- AC_DEFINE(HAVE_WEBKIT4,1,[webkit 4.0 support])
+
AC_DEFINE(HAVE_WEBKIT4,1,[webkit 4.0 support])
else
else
- PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-3.0],
- [webkit_3_0_enabled=yes] )
- AC_DEFINE(HAVE_WEBKIT3,1,[webkit 3.0 support])
-
+
PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-3.0],
+
[webkit_3_0_enabled=yes] )
+
AC_DEFINE(HAVE_WEBKIT3,1,[webkit 3.0 support])
+
fi
AM_CONDITIONAL(HAVE_WEBKIT3, test "$webkit_3_0_enabled" = "yes")
fi
AM_CONDITIONAL(HAVE_WEBKIT3, test "$webkit_3_0_enabled" = "yes")
@@
-116,16
+116,16
@@
dnl -- javascriptcoregtk-4.0 ** not sure if this is needed....
PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-4.0],
PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-4.0],
- [javascriptcoregtk_4_0_enabled=yes],
- [javascriptcoregtk_4_0_enabled=no])
+
[javascriptcoregtk_4_0_enabled=yes],
+
[javascriptcoregtk_4_0_enabled=no])
if test $javascriptcoregtk_4_0_enabled = yes; then
if test $javascriptcoregtk_4_0_enabled = yes; then
- AC_DEFINE(HAVE_JAVASCRIPTCOREGTK4,1,[javascriptcoregtk 4.0 support])
+
AC_DEFINE(HAVE_JAVASCRIPTCOREGTK4,1,[javascriptcoregtk 4.0 support])
else
else
- PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-3.0],
- [javascriptcoregtk_3_0_enabled=yes] )
- AC_DEFINE(HAVE_JAVASCRIPTCOREGTK3,1,[javascriptcoregtk 3.0 support])
-
+
PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-3.0],
+
[javascriptcoregtk_3_0_enabled=yes] )
+
AC_DEFINE(HAVE_JAVASCRIPTCOREGTK3,1,[javascriptcoregtk 3.0 support])
+
fi
AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK3, test "$javascriptcoregtk_3_0_enabled" = "yes")
fi
AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK3, test "$javascriptcoregtk_3_0_enabled" = "yes")
@@
-137,24
+137,24
@@
dnl --- vte -- fixme..
PKG_CHECK_MODULES(VTE, [vte-2.91],
PKG_CHECK_MODULES(VTE, [vte-2.91],
- [vte_2_91_enabled=yes],
- [vte_2_91_enabled=no])
-
+
[vte_2_91_enabled=yes],
+
[vte_2_91_enabled=no])
+
if test $vte_2_91_enabled = yes; then
if test $vte_2_91_enabled = yes; then
- AC_DEFINE(HAVE_VTE_2_91,1,[libvte 2.91 support])
+
AC_DEFINE(HAVE_VTE_2_91,1,[libvte 2.91 support])
else
else
- PKG_CHECK_MODULES(VTE, [vte-2.90],
- [vte_2_90_enabled=yes]
+
PKG_CHECK_MODULES(VTE, [vte-2.90],
+
[vte_2_90_enabled=yes]
)
)
- AC_DEFINE(HAVE_VTE_2_90,1,[libvte 2.90 support])
+
AC_DEFINE(HAVE_VTE_2_90,1,[libvte 2.90 support])
fi
AM_CONDITIONAL(HAVE_VTE_2_90, test "$vte_2_90_enabled" = "yes")
AM_CONDITIONAL(HAVE_VTE_2_91, test "$vte_2_91_enabled" = "yes")
AC_CONFIG_FILES([
fi
AM_CONDITIONAL(HAVE_VTE_2_90, test "$vte_2_90_enabled" = "yes")
AM_CONDITIONAL(HAVE_VTE_2_91, test "$vte_2_91_enabled" = "yes")
AC_CONFIG_FILES([
- Makefile
- src/Makefile
+
Makefile
+
src/Makefile
])
])