adopt to arc1.0.1

search for libraries in /usr/local instead of /opt/local

diff --git a/ext/arc_get.cpp b/ext/arc_get.cpp
index 656bf0b..bfcdff7 100644 (file)
--- a/ext/arc_get.cpp
+++ b/ext/arc_get.cpp
@@ -117,7 +117,7 @@ int arc_get(int argc, char **argv) {
   int result = 0;
        for (std::list<Arc::JobController*>::iterator it = jobcont.begin();
                 it != jobcont.end(); it++){
-               if (!(*it)->Get(status, downloaddir, keep)){
+               if (!(*it)->Get(status, downloaddir, keep, false, false)){
                        result = 1;
                }
        }

diff --git a/ext/extconf.rb b/ext/extconf.rb
index 3fba1ac..ebcfde7 100644 (file)
--- a/ext/extconf.rb
+++ b/ext/extconf.rb
@@ -1,25 +1,25 @@
 require 'mkmf'
 
 dirs = <<-EODIRS
-/opt/local/include/libxml2 
-/opt/local/include/giomm-2.4 
-/opt/local/lib/giomm-2.4/include 
-/opt/local/include/glibmm-2.4 
-/opt/local/lib/glibmm-2.4/include 
-/opt/local/include/glib-2.0 
-/opt/local/lib/glib-2.0/include 
-/opt/local/include 
-/opt/local/include/sigc++-2.0 
-/opt/local/lib/sigc++-2.0/include
+/usr/local/include/libxml2 
+/usr/local/include/giomm-2.4 
+/usr/local/lib/giomm-2.4/include 
+/usr/local/include/glibmm-2.4 
+/usr/local/lib/glibmm-2.4/include 
+/usr/local/include/glib-2.0 
+/usr/local/lib/glib-2.0/include 
+/usr/local/include 
+/usr/local/include/sigc++-2.0 
+/usr/local/lib/sigc++-2.0/include
 EODIRS
 
 dirs.split.each do |dir|
   $INCFLAGS << " " << "-I#{dir}"
-  $INCFLAGS << " " << "-I#{dir.gsub('/opt/local', '/usr')}"
+  $INCFLAGS << " " << "-I#{dir.gsub('/usr/local', '/usr')}"
 end
 
 
-["/opt/local", "/usr/lib"].each do |prefix|
+["/usr/local", "/usr/lib"].each do |prefix|
 
   find_header "libxml/xmlmemory.h", "#{prefix}/include/libxml2"
   find_header "sigc++/slot.h", "#{prefix}/include/sigc++-2.0"
@@ -29,7 +29,7 @@ end
 #for debug info
 $CFLAGS << '-g'
 
-$LIBS << ' -larcclient -larccommon -larcdata2 -larcloader -larcmessage -lglibmm-2.4 -lsigc-2.0 -lxmlsec1-openssl -lxmlsec1'
+$LIBS << ' -larcclient -larccommon -larcdata2 -larcloader -larcmessage -lglibmm-2.4 -lsigc-2.0'
 
 create_makefile("arc_client_c")