patches/gnome-system-tools-01-config.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 8394 bcd58bae020d
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8394
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     1
--- gnome-system-tools-2.14.0.orig/configure.in	2006-03-13 21:19:33.000000000 +0800
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     2
+++ gnome-system-tools-2.14.0/configure.in	2006-10-18 13:22:20.546412000 +0800
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     3
@@ -68,8 +68,15 @@
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     4
 dnl LibUtil checking
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     5
 dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     6
 
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     7
+# Don't do on Solaris
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     8
+case $host_os in
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
     9
+solaris*)
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    10
+    ;;
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    11
+*)
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    12
 AC_CHECK_LIB(util, forkpty, , [AC_MSG_ERROR(Libutil library ir required.)])
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    13
 AC_CHECK_HEADER(pty.h, )
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    14
+    ;;
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    15
+esac
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    16
 
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    17
 dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    18
 dnl END: LibUtil checking
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    19
@@ -131,6 +138,26 @@
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    20
 dnl =====================================================
6955
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    21
 
8394
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    22
 dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    23
+dnl Check for GKSU, on Solaris Only
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    24
+dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    25
+
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    26
+case $host_os in
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    27
+solaris*)
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    28
+PKG_CHECK_MODULES(GKSU,[
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    29
+			   libgksu1.2 >= 1.3.1,
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    30
+			   libgksuui1.0 >= 1.0
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    31
+			   ],[
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    32
+			AC_DEFINE(HAVE_GKSU, 1, [define if you have Gksu library])])
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    33
+    ;;
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    34
+*)
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    35
+    ;;
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    36
+esac
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    37
+
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    38
+dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    39
+dnl END: Check for GKSU
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    40
+dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    41
+
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    42
+dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    43
 dnl Check for GST Modules to build
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    44
 dnl =====================================================
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    45
 
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    46
@@ -245,10 +272,10 @@
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    47
 dnl GST_DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    48
 GST_DEPRECATED_FLAGS=""
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    49
 
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    50
-GST_LIBS="$GST_DEPENDS_LIBS"
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    51
-GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    52
+GST_LIBS="$GST_DEPENDS_LIBS $GKSU_LIBS"
bcd58bae020d 2006-10-21 Jim Li <[email protected]>
jim
parents: 6955
diff changeset
    53
+GST_CFLAGS="$GST_DEPENDS_CFLAGS $GKSU_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
6955
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    54
 
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    55
-GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    56
+GST_TOOL_LIBS="$GST_LIBS \$(top_builddir)/src/common/libsetuptool.a"
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    57
 GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    58
 
fef846f62545 2006-03-16 Padraig O'Briain <[email protected]>
padraigo
parents:
diff changeset
    59
 GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"