--- setup.py.orig	2019-02-14 17:27:14.000000000 +0100
+++ setup.py	2019-03-24 16:11:44.597959525 +0100
@@ -93,7 +93,8 @@ libraries=[]
 libdirs=[]
 import numpy
 incdirs=[numpy.get_include()]
-if "pygrib" in packages_to_install: libraries+=[grib_api_libname]
+g2clibname = 'g2c_v1.6.0'
+if "pygrib" in packages_to_install: libraries+=[grib_api_libname, g2clibname]
 
 if grib_api_libdir is None and grib_api_dir is not None:
     libdirs.append(os.path.join(grib_api_dir,'lib'))
@@ -134,23 +135,28 @@ if zlib_libdir is None and zlib_dir is n
 if zlib_incdir is None and zlib_dir is not None:
     incdirs.append(os.path.join(zlib_dir,'include'))
 
-g2clib_deps = glob.glob('g2clib_src/*.c')
-g2clib_deps.append(g2clib_pyx)
-incdirs.append("g2clib_src")
+#g2clib_deps = glob.glob('g2clib_src/*.c')
+#g2clib_deps.append(g2clib_pyx)
+g2clib_deps = [g2clib_pyx,]
+g2clib_dir = '/usr/lib64'
+g2clib_incdir = '/usr/include'
+libdirs.append(g2clib_dir)
+incdirs.append(g2clib_incdir)
+#incdirs.append("g2clib_src")
 macros=[]
 
 # if jasper or openjpeg lib not available...
-if 'jasper' not in libraries and 'openjpeg' not in libraries:
-    g2clib_deps.remove(os.path.join('g2clib_src', 'jpcpack.c'))
-    g2clib_deps.remove(os.path.join('g2clib_src', 'jpcunpack.c'))
-else:
-    macros.append(('USE_JPEG2000',1))
-# if png lib not available...
-if 'png' not in libraries:
-    g2clib_deps.remove(os.path.join('g2clib_src', 'pngpack.c'))
-    g2clib_deps.remove(os.path.join('g2clib_src', 'pngunpack.c'))
-else:
-    macros.append(('USE_PNG',1))
+#if 'jasper' not in libraries and 'openjpeg' not in libraries:
+#    g2clib_deps.remove(os.path.join('g2clib_src', 'jpcpack.c'))
+#    g2clib_deps.remove(os.path.join('g2clib_src', 'jpcunpack.c'))
+#else:
+#    macros.append(('USE_JPEG2000',1))
+## if png lib not available...
+#if 'png' not in libraries:
+#    g2clib_deps.remove(os.path.join('g2clib_src', 'pngpack.c'))
+#    g2clib_deps.remove(os.path.join('g2clib_src', 'pngunpack.c'))
+#else:
+#    macros.append(('USE_PNG',1))
 
 if hasattr(sys,'maxsize'):
     if sys.maxsize > 2**31-1: macros.append(('__64BIT__',1))