2006-10-21 Jim Li <
[email protected]>
* gnome-system-tools.spec:
Run autoconf since we're patching configure.ac to look for gksu.
* patches/gnome-system-tools-01-config.diff:
Add check for gksu library.
* patches/gnome-system-tools-02-forkpty.diff:
Integrate gksu library into GST.
--- gnome-system-tools-2.14.0.orig/configure.in 2006-03-13 21:19:33.000000000 +0800
+++ gnome-system-tools-2.14.0/configure.in 2006-10-18 13:22:20.546412000 +0800
@@ -68,8 +68,15 @@
dnl LibUtil checking
dnl =====================================================
+# Don't do on Solaris
+case $host_os in
+solaris*)
+ ;;
+*)
AC_CHECK_LIB(util, forkpty, , [AC_MSG_ERROR(Libutil library ir required.)])
AC_CHECK_HEADER(pty.h, )
+ ;;
+esac
dnl =====================================================
dnl END: LibUtil checking
@@ -131,6 +138,26 @@
dnl =====================================================
dnl =====================================================
+dnl Check for GKSU, on Solaris Only
+dnl =====================================================
+
+case $host_os in
+solaris*)
+PKG_CHECK_MODULES(GKSU,[
+ libgksu1.2 >= 1.3.1,
+ libgksuui1.0 >= 1.0
+ ],[
+ AC_DEFINE(HAVE_GKSU, 1, [define if you have Gksu library])])
+ ;;
+*)
+ ;;
+esac
+
+dnl =====================================================
+dnl END: Check for GKSU
+dnl =====================================================
+
+dnl =====================================================
dnl Check for GST Modules to build
dnl =====================================================
@@ -245,10 +272,10 @@
dnl GST_DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
GST_DEPRECATED_FLAGS=""
-GST_LIBS="$GST_DEPENDS_LIBS"
-GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
+GST_LIBS="$GST_DEPENDS_LIBS $GKSU_LIBS"
+GST_CFLAGS="$GST_DEPENDS_CFLAGS $GKSU_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
-GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
+GST_TOOL_LIBS="$GST_LIBS \$(top_builddir)/src/common/libsetuptool.a"
GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"