| 1 |
jmbsvicetto 09/04/27 02:02:32 |
| 2 |
|
| 3 |
Added: |
| 4 |
libcompizconfig-0.8.2-allow-system-libiniparser.patch |
| 5 |
Log: |
| 6 |
Added patch to allow the use of system iniparser. Many thanks to Diego E. Pettenò <flameeyes@g.o> for the help with auto-tools. |
| 7 |
Dropped ppc/ppc64 keywords until iniparser is keyworded. Fixes bug 259715. |
| 8 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libcompizconfig-0.8.2-allow-system-libiniparser.patch |
| 17 |
=================================================================== |
| 18 |
diff -u -r libcompizconfig-0.8.2-old/configure.ac libcompizconfig-0.8.2/configure.ac |
| 19 |
--- libcompizconfig-0.8.2-old/configure.ac 2009-04-26 12:15:40.000000000 +0000 |
| 20 |
+++ libcompizconfig-0.8.2/configure.ac 2009-04-26 23:02:14.000000000 +0000 |
| 21 |
@@ -116,6 +116,16 @@ |
| 22 |
fi |
| 23 |
AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"]) |
| 24 |
|
| 25 |
+AC_ARG_WITH(internal-iniparser, |
| 26 |
+ [AS_HELP_STRING([--without-internal-iniparser],[Don't use bundled iniparser lib])], |
| 27 |
+ [], [with_internal_iniparser=yes]) |
| 28 |
+ |
| 29 |
+if test "x$with_internal_iniparser" = "xno"; then |
| 30 |
+ AC_CHECK_LIB([iniparser], [iniparser_getnsec], [], |
| 31 |
+ [AC_MSG_ERROR([Error! You need to have libiniparser])]) |
| 32 |
+fi |
| 33 |
+AM_CONDITIONAL([WITH_INTERNAL_INIPARSER], [test "x$with_internal_iniparser" = "xyes"]) |
| 34 |
+ |
| 35 |
AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes], [have_inotify=no]) |
| 36 |
|
| 37 |
AC_ARG_ENABLE(debug, |
| 38 |
diff -u -r libcompizconfig-0.8.2-old/src/Makefile.am libcompizconfig-0.8.2/src/Makefile.am |
| 39 |
--- libcompizconfig-0.8.2-old/src/Makefile.am 2009-04-26 12:15:39.000000000 +0000 |
| 40 |
+++ libcompizconfig-0.8.2/src/Makefile.am 2009-04-26 23:00:37.000000000 +0000 |
| 41 |
@@ -39,14 +39,17 @@ |
| 42 |
lists.c \ |
| 43 |
compiz.cpp \ |
| 44 |
config.c \ |
| 45 |
- iniparser.c \ |
| 46 |
ini.c \ |
| 47 |
bindings.c \ |
| 48 |
filewatch.c \ |
| 49 |
- ccs-private.h \ |
| 50 |
- iniparser.h |
| 51 |
+ ccs-private.h |
| 52 |
|
| 53 |
libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB) |
| 54 |
|
| 55 |
lib_LTLIBRARIES=libcompizconfig.la |
| 56 |
|
| 57 |
+if WITH_INTERNAL_INIPARSER |
| 58 |
+ |
| 59 |
+ libcompizconfig_la_SOURCES += iniparser.h iniparser.c |
| 60 |
+ |
| 61 |
+endif |
Archives