[GNUnet-SVN] r172 - in Extractor: . src/plugins/rpm

[grothoff]

Author: grothoff
Date: 2005-02-03 10:03:06 -0800 (Thu, 03 Feb 2005)
New Revision: 172

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/rpm/rpmextractor.c
Log:
allow --disable-glib

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2005-02-03 12:14:01 UTC (rev 171)
+++ Extractor/configure.ac      2005-02-03 18:03:06 UTC (rev 172)
@@ -178,6 +178,17 @@
 AM_PATH_GLIB_2_0(2.0.0,
                 without_glib=false,
                  without_glib=true)
+AC_MSG_CHECKING([whether glib is disabled])
+AC_ARG_ENABLE(glib,
+  [AC_HELP_STRING([--disable-glib],[disable glib support])],
+  [case "$enableval" in
+   no)  AC_MSG_RESULT(disabled)
+        without_glib=true
+        ;;
+   *)   AC_MSG_RESULT(allowed)
+        ;;
+   esac])
+
 if test x$without_glib != xtrue
 then
   if test $with_gnu_ld == yes
@@ -194,6 +205,7 @@
  AM_CONDITIONAL(HAVE_GLIB,false)
  AC_DEFINE(HAVE_GLIB, 0, [Have glib])
 fi
+        
 
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)

Modified: Extractor/src/plugins/rpm/rpmextractor.c
===================================================================
--- Extractor/src/plugins/rpm/rpmextractor.c    2005-02-03 12:14:01 UTC (rev 
171)
+++ Extractor/src/plugins/rpm/rpmextractor.c    2005-02-03 18:03:06 UTC (rev 
172)
@@ -3040,7 +3040,7 @@
     return prev;
   }
   prev = addKeyword(EXTRACTOR_MIMETYPE,
-                   "application/x-rpm",
+                   "application/x-redhat-package-manager",
                    prev);
   /* FIXME: add platform! */
   if (isSource)