Fix BinDeps on Windows

Also clean the code.

Author: nalimilan

deps/build.jl

@@ -2,11 +2,9 @@ using BinDeps
 
 @BinDeps.setup
 
-deps = [
-	libiconv = library_dependency("libiconv", aliases = ["libc", "iconv"],
-                                  # Check whether libc provides iconv_open (as on Linux)
-                                  validate = (n, h) -> Libdl.dlsym_e(h, "iconv_open") != C_NULL)
-]
+libiconv = library_dependency("libiconv", aliases = ["libc", "iconv"],
+                              # Check whether libc provides iconv_open (as on Linux)
+                              validate = (n, h) -> Libdl.dlsym_e(h, "iconv_open") != C_NULL)
 
 @windows_only begin
     using WinRPM
@@ -20,9 +18,10 @@ end
 
 provides(Sources, URI("http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz"), libiconv)
 
-provides(BuildProcess, Autotools(libtarget = "lib/libiconv.la",
-                                 installed_libname = "libiconv"*BinDeps.shlib_ext),
+provides(BuildProcess,
+         Autotools(libtarget = "lib/libiconv.la",
+                   installed_libname = "libiconv"*BinDeps.shlib_ext),
          libiconv,
          os = :Unix)
 
-@BinDeps.install Dict(:libiconv => :libiconv_path)
+@BinDeps.install

src/iconv.jl

@@ -5,7 +5,8 @@ import Base: close, eof, flush, read, readall, write
 import Base.Libc: errno, strerror
 export StringEncoder, StringDecoder, encode, decode
 
-include("../deps/deps.jl")
+depsjl = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
+isfile(depsjl) ? include(depsjl) : error("libiconv not properly installed. Please run\nPkg.build(\"iconv\")")
 
 
 ## iconv wrappers
@@ -16,13 +17,13 @@ const EILSEQ = 84
 
 function iconv_close(cd::Ptr{Void})
     if cd != C_NULL
-        ccall((:iconv_close, libiconv_path), Cint, (Ptr{Void},), cd) == 0 ||
+        ccall((:iconv_close, libiconv), Cint, (Ptr{Void},), cd) == 0 ||
             error("failed to call iconv_close: error $(errno()) ($(strerror(errno())))")
     end
 end
 
 function iconv_open(tocode, fromcode)
-    p = ccall((:iconv_open, libiconv_path), Ptr{Void}, (Cstring, Cstring), tocode, fromcode)
+    p = ccall((:iconv_open, libiconv), Ptr{Void}, (Cstring, Cstring), tocode, fromcode)
     if p != Ptr{Void}(-1)
         return p
     elseif errno() == EINVAL
@@ -69,7 +70,7 @@ function iconv!(cd::Ptr{Void}, inbuf::Vector{UInt8}, outbuf::Vector{UInt8},
     inbytesleft_orig = inbytesleft[]
     outbytesleft[] = BUFSIZE
 
-    ret = ccall((:iconv, libiconv_path), Csize_t,
+    ret = ccall((:iconv, libiconv), Csize_t,
                 (Ptr{Void}, Ptr{Ptr{UInt8}}, Ref{Csize_t}, Ptr{Ptr{UInt8}}, Ref{Csize_t}),
                 cd, inbufptr, inbytesleft, outbufptr, outbytesleft)
 
@@ -101,7 +102,7 @@ function iconv_reset!(s::Union{StringEncoder, StringDecoder})
 
     s.outbufptr[] = pointer(s.outbuf)
     s.outbytesleft[] = BUFSIZE
-    ret = ccall((:iconv, libiconv_path), Csize_t,
+    ret = ccall((:iconv, libiconv), Csize_t,
                 (Ptr{Void}, Ptr{Ptr{UInt8}}, Ref{Csize_t}, Ptr{Ptr{UInt8}}, Ref{Csize_t}),
                 s.cd, C_NULL, C_NULL, s.outbufptr, s.outbytesleft)