configure.ac

diff --git a/configure.ac b/configure.ac
index 792066b..864868d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,133 +28,35 @@ PKG_CHECK_MODULES(ROOJSPACKER, [
                  
 ])
 
-dnl --- libvala -- needs to find matching really..
-
-
-PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
-                               [vala_2_8_enabled=yes],
-                               [vala_2_8_enabled=no]) 
-                               
-if test $vala_2_8_enabled = yes; then
-               AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
-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])
-               else
-                        PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
-                               [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
-                               PKG_CHECK_MODULES(LIBVALA, [libvala-0.22],
-                                       [vala_2_2_enabled=yes] )
-                                       
-                               AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
-                       fi
-               fi
-fi
-
-AM_CONDITIONAL(HAVE_LIBVALA28, test "$vala_2_8_enabled" = "yes")
-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")
 
-  
-
-dnl --- gda
-
-
-
-PKG_CHECK_MODULES(GDA, [libgda-5.0],
-                               [gda_5_0_enabled=yes],
-                               [gda_5_0_enabled=no])
-
-if test $gda_5_0_enabled = yes; then
-               AC_DEFINE(HAVE_GDA5,1,[libgda 5.0 support])
-else
-               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")
-
-
-dnl  -- webkit-4.0 
-
-
-PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-4.0],
-                               [webkit_4_0_enabled=yes],
-                               [webkit_4_0_enabled=no])
-
-if test $webkit_4_0_enabled = yes; then
-               AC_DEFINE(HAVE_WEBKIT4,1,[webkit 4.0 support])
-else
-               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")
-AM_CONDITIONAL(HAVE_WEBKIT4, test "$webkit_4_0_enabled" = "yes")
+dnl  -- javascriptcoregtk-4.0  ** might add this later -- verify compilation.
+
+
+dnl PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-4.0],
+dnl                            [javascriptcoregtk_4_0_enabled=yes],
+dnl                            [javascriptcoregtk_4_0_enabled=no])
+dnl
+dnl if test $javascriptcoregtk_4_0_enabled = yes; then
+dnl            AC_DEFINE(HAVE_JAVASCRIPTCOREGTK4,1,[javascriptcoregtk 4.0 support])
+dnl else
+dnl            PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-3.0],
+dnl                            [javascriptcoregtk_3_0_enabled=yes] )
+dnl            AC_DEFINE(HAVE_JAVASCRIPTCOREGTK3,1,[javascriptcoregtk 3.0 support])
+dnl       
+dnl
+dnl fi
+dnl AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK3, test "$javascriptcoregtk_3_0_enabled" = "yes")
+dnl AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK4, test "$javascriptcoregtk_4_0_enabled" = "yes")
 
-
-
-dnl  -- javascriptcoregtk-4.0  ** not sure if this is needed....
-
-
-PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-4.0],
-                               [javascriptcoregtk_4_0_enabled=yes],
-                               [javascriptcoregtk_4_0_enabled=no])
-
-if test $javascriptcoregtk_4_0_enabled = yes; then
-               AC_DEFINE(HAVE_JAVASCRIPTCOREGTK4,1,[javascriptcoregtk 4.0 support])
-else
-               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")
-AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK4, test "$javascriptcoregtk_4_0_enabled" = "yes")
-
-
-
-dnl --- vte -- fixme - its not used yet.. not sure if we will use it....
  
-
-PKG_CHECK_MODULES(VTE, [vte-2.91],
-                               [vte_2_91_enabled=yes],
-                               [vte_2_91_enabled=no])
-                               
-if test $vte_2_91_enabled = yes; then
-               AC_DEFINE(HAVE_VTE_2_91,1,[libvte 2.91 support])
-else
-               PKG_CHECK_MODULES(VTE, [vte-2.90],
-                               [vte_2_90_enabled=yes]
-               )
-               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([
        Makefile
        src/Makefile
 ])
 
   
-AC_SUBST(BUILDER_CFLAGS)
-AC_SUBST(BUILDER_LIBS)
+AC_SUBST(ROOJSPACKER_CFLAGS)
+AC_SUBST(ROOJSPACKER_LIBS)
 
 
 AC_OUTPUT