[freefempp] 15/23: Apply Cristoph's configure.patch

[Dimitrios Eftaxiopoulos]

This is an automated email from the git hooks/post-receive script.

eftaxiop-guest pushed a commit to branch eftaxiop
in repository freefempp.

commit 028877b4517b9902eab8b710a1294e69aa72b237
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Tue Sep 10 16:53:00 2013 +0300

    Apply Cristoph's configure.patch
---
 debian/patches/configure.patch |   85 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |    1 +
 src/fflib/strversionnumber.cpp |    4 +-
 3 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
new file mode 100644
index 0000000..cd83533
--- /dev/null
+++ b/debian/patches/configure.patch
@@ -0,0 +1,85 @@
+Fix compilation issues related to libraries and flags
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,6 +45,7 @@
+ ]) dnl 
+ m4_define([AC_FF_WHERELIB],
+     [  	if test -z "$ff_where_lib_conf_$1" ; then
++	 dnl AC_MSG_NOTICE([AC_FF_WHERELIB check $1 $2 $3 $4])
+         AC_MSG_CHECKING(check $1)
+ 	ff_save_libs=$LIBS
+ 	LIBS="$LIBS $2 $4"
+@@ -53,6 +54,7 @@
+ 	    echo "$1 LD $2"  >>$ff_where_lib_conf
+ 	    ff_WHERE_INC=`AS_DIRNAME(["$3"])`
+ 	    if test -n "$ff_WHERE_INC" -a  "$ff_WHERE_INC" != '.'   ; then
++		dnl AC_MSG_NOTICE([AC_FF_WHERELIB $1 INCLUDE -I$ff_WHERE_INC])
+ 		echo "$1 INCLUDE -I$ff_WHERE_INC"  >>$ff_where_lib_conf
+ 	    fi 
+ 	fi
+@@ -60,6 +62,8 @@
+ 
+         ff_where_lib_conf_$1=1
+ 	LIBS=$ff_save_libs
++	dnl else
++	dnl    AC_MSG_NOTICE([AC_FF_WHERELIB nocheck $1 $2 $3 $4])
+ 	fi	
+     ])dnl end m4_define AC_FF_WHERELIB
+ 
+@@ -1890,29 +1894,42 @@
+ test -n "$ff_mkl_scalapack" && ff_scalapack="$ff_mkl_scalapack"
+ test -n "$ff_mkl_root" && ff_winc="$ff_mkl_root/include/mkl_blas.h"
+ 
++# For ipot
++AC_CHECK_HEADERS(cstddef,
++  [AC_DEFINE(HAVE_CSTDDEF, 1, cstddef exists)],
++  [])
++AC_CHECK_HEADERS(stddef.h,
++  [AC_DEFINE(HAVE_STDDEF_H, 1, stddef.h exists)],
++  [])
+ 
+ m4_map([AC_FF_WHERELIB],[ 
+-	[[mumps],[-ldmumps -lzmumps  -lmumps_common  -lpord],[dmumps_c.h],[]],
+-	[[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[dmumps_c.h]],
+-	[[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[dmumps_c.h]],
++	[[mumps_seq],[-ldmumps_seq -lzmumps_seq  -lmumps_common_seq  -lpord_seq],[/usr/include/dmumps_c.h],[]],
++	[[mumps],[-ldmumps -lzmumps  -lmumps_common  -lpord],[/usr/include/dmumps_c.h],[]],
++	[[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[/usr/include/dmumps_c.h]],
++	[[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[/usr/include/dmumps_c.h]],
+ 	[[hypre],[-lHYPRE]],
+ 	[[fftw3],[-lfftw3],[/usr/include/fftw3.h],[]],
+-	[[superlu_dist],[-lsuperlu-dist],[superlu-dist/superlu_defs.h],[]],
+-	[[superlu],[-lsuperlu],[superlu/slu_ddefs.h],[]],
+-	[[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.h],[]],
++	[[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
++	[[superlu],[-lsuperlu],[/usr/include/superlu/slu_ddefs.h],[]],
++	[[Superlu4],[-lsuperlu4],[/usr/include/superlu4/slu_ddefs.h],[]],
+         [[blacs],[ -lblacsCinit$ff_with_mpi	-lblacsF77init$ff_with_mpi	-lblacs$ff_with_mpi],[]],
+         [[scalapack],[-lscalapack$ff_with_mpi],[]],
+-        [[scotch],[-lscotch -lscotcherr],[]],
++        [[scotch],[-lscotch -lscotcherr],[/usr/include/scotch/scotch.h],[]],
+         [[ptscotch],[-lptscotch -lptscotcherr],[]],
+-	[[metis],[-lscotch -lmetis],[metis/metis.h],[]],
+-	[[metis],[-lscotch -lmetis],[metis.h],[]],
++	[[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
+ 	[[parmetis],[-lptscotch -lparmetis],[],[]],
+-	[[freeyams],[-lfreeyams],[freeyamslib.h],[]],
+-	[[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
++	[[freeyams],[-lfreeyams],[/usr/include/freeyamslib.h],[]],
++	[[mmg3d_v4],[-lmmg3dlib4.0],[/usr/include/libmmg3d.h],[]],
+ 	[[mshmet],[-lmshmet],[],[]],
+-	[[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
+-	[[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
+-	[[tetgen],[-ltet],[tetgen.h],[]],
++	[[gsl],[-lgsl -lgslcblas -lm],[/usr/include/gsl/gsl_sf.h],[]],
++	[[parms],[-lparms2 -litsol -llapack -lblas -lm -lmpi_f77],[/usr/include/libparms2/psparslib.h],[]],
++	[[double_pastix],[-lpastix -lgfortran -lm -lrt -L/usr/lib -lscotch -lscotcherrexit -lpthread],[],[]],
++	[[complex_pastix],[-lpastix -lgfortran -lm -lrt -L/usr/lib -lscotch -lscotcherrexit -lpthread],[],[]],
++	[[tetgen],[-ltet],[/usr/include/tetgen.h],[]],
++	[[hips],[-lhips],[/usr/include/hips/hips.h],[]],
++	[[nlopt],[-lnlopt],[/usr/include/nlopt.h],[]],
++	[[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[/usr/include/coin/IpIpoptApplication.hpp],[]],
++	[[gmm],[-lm],[/usr/include/gmm/gmm.h],[]],
+     ]
+     )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..37a4b42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+configure.patch
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 8897b60..18f5a95 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
 //  buffer.precision(8);
 //  buffer<<VersionNumber();
   static char buffer[100];
-  sprintf(buffer," %9f (date Κυρ 08 Σεπ 2013 11:04:19 μμ EEST)",VersionNumber());
-  return buffer; //.str()+" (date Κυρ 08 Σεπ 2013 11:04:19 μμ EEST)" ;
+  sprintf(buffer," %9f (date Τρι 10 Σεπ 2013 04:42:28 μμ EEST)",VersionNumber());
+  return buffer; //.str()+" (date Τρι 10 Σεπ 2013 04:42:28 μμ EEST)" ;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git