found bug with config.h install. Changed config.h to pfnet_config.h and added nobase nodist option to install it but not put in in dist

Author: ttinoco

.gitignore

@@ -36,6 +36,8 @@ config.sub
 depcomp
 include/pfnet/config.h
 include/pfnet/config.h.in
+include/pfnet/pfnet_config.h
+include/pfnet/pfnet_config.h.in
 include/pfnet/stamp-h1
 install-sh
 libtool

configure.ac

@@ -5,7 +5,7 @@
 AC_INIT([PFNET], [1.2.9], [ttinoco5687@gmail.com])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([src/net/net.c])
-AC_CONFIG_HEADERS([include/pfnet/config.h])
+AC_CONFIG_HEADERS([include/pfnet/pfnet_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Add libtools

include/pfnet/graph.h

@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 #include "net.h"
-#include "config.h"
+#include "pfnet_config.h"
 
 #if defined(HAVE_GRAPHVIZ_GVC_H) && defined(HAVE_LIBGVC) && defined(HAVE_LIBCGRAPH)
 #define HAVE_GRAPHVIZ 1

include/pfnet/parser_RAW.h

@@ -12,7 +12,7 @@
 #define __PARSER_RAW_HEADER__
 
 #include "parser.h"
-#include "config.h"
+#include "pfnet_config.h"
 
 // Interface
 Parser* RAW_PARSER_new(void);

python/docs/_static/pfnet-1.2.9.tar.gz

@@ -15,10 +15,10 @@ make
 make check
 make install
 ls $PFNET/build/lib
+ls $PFNET/build/include/pfnet
 cd ../../../
 ./clean.sh
-ls $PFNET/build/lib
-python setup.py build_ext --inplace --libdirs=$PFNET/build/lib
+python setup.py build_ext --inplace --libdirs=$PFNET/build/lib --incdirs=$PFNET/build/include
 ls pfnet
 python -c "import pfnet; assert True"
 cd docs

python/docs/build.sh

@@ -15,11 +15,23 @@
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--libdirs', dest='libdirs', action='store',nargs='*',default=[])
+parser.add_argument('--incdirs', dest='incdirs', action='store',nargs='*',default=[])
 args,unknown = parser.parse_known_args()
 sys.argv = [sys.argv[0]] + unknown
 
+if args.libdirs:
+    library_dirs=args.libdirs
+    extra_link_args=["-Wl,-rpath,%s" %s for s in args.libdirs]
+else:
+    library_dirs=[]
+    extra_link_args=["-Wl,-rpath,/usr/local/lib"]
+if args.incdirs:
+    include_dirs=[np.get_include()]+args.incdirs
+else:
+    include_dirs=[np.get_include(),"../include"]
+
 setup(name='PFNET',
-      version='1.2.8',
+      version='1.2.9',
       license='BSD 2-clause license',
       description='Power Flow Network Library',
       author='Tomas Tinoco De Rubira',
@@ -31,8 +43,9 @@
                 'pfnet.constraints'],
       ext_modules=cythonize([Extension("pfnet.cpfnet", 
                                        [os.path.join("pfnet","cpfnet.pyx")],
-                                       library_dirs=args.libdirs,
+                                       include_dirs=include_dirs,
+                                       library_dirs=library_dirs,
                                        libraries=["pfnet"],
                                        extra_compile_args=[],
-                                       extra_link_args=['-Wl,-rpath,%s' %s for s in args.libdirs]+["-Wl,-rpath,/usr/local/lib"],
-                                       include_dirs=["../include",np.get_include()])]))
+                                       extra_link_args=extra_link_args)]))
+

python/setup.py

@@ -5,6 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
 # local paths for includes
 inc_path = $(top_srcdir)/include/pfnet
 
+nobase_nodist_include_HEADERS = $(inc_path)/pfnet_config.h
+
 # libraries
 lib_LTLIBRARIES = libpfnet.la