Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > 40650a3512ede32c0dc7f219e61eb543 > files > 5

freefem++-3.10-1.fc14.src.rpm

diff -up freefem++-3.10/acoptim.m4.r freefem++-3.10/acoptim.m4
--- freefem++-3.10/acoptim.m4.r	2010-09-20 19:12:45.000000000 +0200
+++ freefem++-3.10/acoptim.m4	2010-11-15 18:43:00.000000000 +0100
@@ -47,14 +47,6 @@ AC_MSG_CHECKING(whether to generate debu
 AC_ARG_ENABLE(debug,[  --enable-debug	Turn on debug versions of FreeFem++])
 AC_ARG_ENABLE(optim,[  --enable-optim	Turn on compiler optimization])
 
-# Autoconf always chooses -O2. -O2 in gcc makes some functions
-# disappear. This is not ideal for debugging. And when we optimize, we
-# do not use -O2 anyway.
-
-CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
-FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
-CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
-
 if test "$enable_debug" = yes;
 then
 	AC_MSG_RESULT(yes)
@@ -63,9 +55,9 @@ else
 
 	# No debugging information in optimized code
 
-	CFLAGS="`echo $CFLAGS | sed 's/-g//g'` -DNDEBUG"
-	FFLAGS="`echo $FFLAGS | sed 's/-g//g'` -DNDEBUG"
-	CXXFLAGS="`echo $CXXFLAGS | sed 's/-g//g'` -DNDEBUG"
+	CFLAGS="$CFLAGS -DNDEBUG"
+	FFLAGS="$FFLAGS -DNDEBUG"
+	CXXFLAGS="$CXXFLAGS -DNDEBUG"
 fi
 
 # Hardware-independant optimization
@@ -99,6 +91,14 @@ if test "$enable_debug" != yes \
     -a "$enable_generic" != yes
 then
 
+# Autoconf always chooses -O2. -O2 in gcc makes some functions
+# disappear. This is not ideal for debugging. And when we optimize, we
+# do not use -O2 anyway.
+
+CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
+FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
+CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
+
     # MacOS X Darwin
     if test -x /usr/bin/hostinfo
 	then
diff -up freefem++-3.10/configure.ac.r freefem++-3.10/configure.ac
--- freefem++-3.10/configure.ac.r	2010-10-05 10:34:59.000000000 +0200
+++ freefem++-3.10/configure.ac	2010-11-15 18:43:00.000000000 +0100
@@ -370,7 +370,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
 # date is only useful for config-version.h
 
 test "$prefix" = NONE && prefix="$ac_default_prefix"
-ff_prefix_dir="${prefix}/lib/ff++/$VERSION"   
+ff_prefix_dir="${libdir}/freefem++"
 AC_MSG_CHECKING(prefix dir freefem++  )
 AC_MSG_RESULT($ff_prefix_dir)	 
 
@@ -1290,7 +1290,7 @@ then
 		AC_CHECK_LIB(umfpack,umf_i_malloc,
 			ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
 			ff_umfpack_ok=yes,,$ff_umfpack_libs)
-		if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then
+		if test "$ff_umfpack_ok" = yes -a "$ff_umfpack_header" != yes ; then
 			AC_MSG_WARN([		Sorry we find UMFPACK lib but not the include umfpack.h file])
 		fi
 	fi	
diff -up freefem++-3.10/examples++-3d/Makefile.am.r freefem++-3.10/examples++-3d/Makefile.am
--- freefem++-3.10/examples++-3d/Makefile.am.r	2010-06-16 14:33:49.000000000 +0200
+++ freefem++-3.10/examples++-3d/Makefile.am	2010-11-15 18:43:00.000000000 +0100
@@ -31,8 +31,8 @@ freefem++.pref:
 	echo loadpath += \"./\" >>freefem++.pref
 
 install-exec-local:: 
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
-	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/idp
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(datadir)/freefem++/idp
+	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(datadir)/freefem++/idp
 
 
 
diff -up freefem++-3.10/examples++-load/load.link.in.r freefem++-3.10/examples++-load/load.link.in
--- freefem++-3.10/examples++-load/load.link.in.r	2010-09-16 12:28:11.000000000 +0200
+++ freefem++-3.10/examples++-load/load.link.in	2010-11-15 18:43:00.000000000 +0100
@@ -13,13 +13,13 @@ if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
 if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
 if [ -z "$MPI_LIB" ] ; then MPI_LIB='@MPI_LIB@' ; fi
 if [ -z "$F77" ] ; then F77='@F77@' ; fi
-if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
-if [ "$MPICXX" = '@'MPICXX'@' ] ; then MPICXX=""; fi
-if [ "$F77" = '@'F77'@' ] ; then F77=""; fi
-if [ "$FFCXXFLAGS" = '@'CXXFLAGS'@' ] ; then FFCXXFLAGS=""; fi
-if [ "$FFFFLAGS" = '@'FFLAGS'@' ] ; then FFFFLAGS=""; fi
-if [ "$FFFLIBS" = '@'FLIBS'@' ] ; then FFFLIBS=""; fi
-if [ "$FFVERSION" = '@'VERSION'@' ] ; then FFVERSION=""; fi
+if [ "$CXX" = '@CXX@' ] ; then CXX=""; fi
+if [ "$MPICXX" = '@MPICXX@' ] ; then MPICXX=""; fi
+if [ "$F77" = '@F77@' ] ; then F77=""; fi
+if [ "$FFCXXFLAGS" = '@CXXFLAGS@' ] ; then FFCXXFLAGS=""; fi
+if [ "$FFFFLAGS" = '@FFLAGS@' ] ; then FFFFLAGS=""; fi
+if [ "$FFFLIBS" = '@FLIBS@' ] ; then FFFLIBS=""; fi
+if [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi
 if [ -z "$INCFF" ] ; then
     if [ -f "@INCFF@/ff++.hpp" ] ; then
 	INCFF="-I@INCFF@"
@@ -29,8 +29,8 @@ if [ -z "$INCFF" ] ; then
 	INCFF="-Iinclude"
     elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
 	INCFF="-IFFAPPLI_INC" 
-    elif [ -f '@ff_prefix_dir@/include/ff++.hpp' ] ; then 
-	INCFF='-I@ff_prefix_dir@/include' 
+    elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then
+	INCFF='-I@includedir@/freefem++'
     else
 	ff=`which freefem++.exe`;
 	ffinc=`dirname "$ff"`/examples++-load/include
diff -up freefem++-3.10/examples++-load/Makefile.am.r freefem++-3.10/examples++-load/Makefile.am
--- freefem++-3.10/examples++-load/Makefile.am.r	2010-10-01 14:46:17.000000000 +0200
+++ freefem++-3.10/examples++-load/Makefile.am	2010-11-15 18:58:50.000000000 +0100
@@ -99,7 +99,7 @@ all.edp: 
 regtests.edp: regtests.m4 ../regtests.m4
 	m4 -DASSERT regtests.m4 > regtests.edp
 
-$(LIST_COMPILE):ff-c++ include Makefile 
+$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile 
 
 clean-local:
 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
@@ -125,20 +125,19 @@ WHERE_LIBRARY-download:ff-pkg-download 
 freefem++.pref:
 	echo loadpath = \"./\" >freefem++.pref
 install-exec-local:: load_compile
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
-	$(INSTALL_DATA)  clapack.h ppmimg.h include/* $(DESTDIR)$(ff_prefix_dir)/include
-	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
-	echo loadpath += \"./\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-	echo includepath += \"$(ff_prefix_dir)/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
+	$(INSTALL_DATA)  include/* $(DESTDIR)$(includedir)/freefem++
+	$(INSTALL)  -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
+	echo loadpath += \"./\"  >$(DESTDIR)$(sysconfdir)/freefem++.pref
+	echo loadpath += \"$(libdir)/freefem++\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
+	echo includepath += \"$(datadir)/freefem++/idp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
 	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
 	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
 	-for i in $(LIST_COMPILE_PKG); do \
-	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
-
+	 if [ -f $$i ] ; then $(INSTALL)  -m 755 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
 
 
 
diff -up freefem++-3.10/Makefile.am.r freefem++-3.10/Makefile.am
--- freefem++-3.10/Makefile.am.r	2010-10-05 15:51:39.000000000 +0200
+++ freefem++-3.10/Makefile.am	2010-11-15 18:43:00.000000000 +0100
@@ -26,14 +26,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
 
 FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
 
-FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION \
+FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INNOVATION \
 mode-mi-edp.zip \
 examples++-tutorial/aile.msh examples++-tutorial/xyf \
 examples++-3d/dodecaedre01.mesh  \
 examples++-3d/lac-leman-v4.msh \
 examples++-load/load.link \
 ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh  \
-./download/fftw/Makefile ./download/fftw/Makefile.am \
+./download/fftw/Makefile \
 examples++*/*.[ie]dp  CheckAllEdp
 
 
@@ -149,8 +149,8 @@ clean-local::
 # Native MacOS packaging
 # ----------------------
 install-exec-local:: 
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/$(VERSION)
-	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir)/$(VERSION); tar xvf -)
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)
+	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir); tar xvf -)
 
 ListFiles-natives: .FORCE 
 #	echo COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION >$@	
@@ -160,7 +160,7 @@ ListFiles-natives: .FORCE 
 #	echo examples++-3d/dodecaedre01.mesh  >> $@
 #	echo examples++-load/load.link >> $@
 #	echo ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh >> $@
-	echo ./download/fftw/Makefile ./download/fftw/Makefile.am  >>$@
+	echo ./download/fftw/Makefile ./download/fftw/Makefile  >>$@
 	find .  -name '*.[ei]dp' -o -name '*.h*' -o -name '*.cpp'  |egrep  '[.]/examples++' >>$@
 	find .   -name '*.h*' -o -name '*.cpp'  |egrep  '[.]/examples++' >>$@
 List-agl-dylib: src/nw/FreeFem++
diff -up freefem++-3.10/src/lglib/Makefile.am.r freefem++-3.10/src/lglib/Makefile.am
--- freefem++-3.10/src/lglib/Makefile.am.r	2010-06-16 14:33:50.000000000 +0200
+++ freefem++-3.10/src/lglib/Makefile.am	2010-11-15 18:43:00.000000000 +0100
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
 BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
 
 lg.tab.hpp  lg.tab.cpp: lg.ypp
-	-rm lg.tab.hpp  lg.tab.cpp lg.tab.cpp.h
+	-rm -f lg.tab.hpp  lg.tab.cpp lg.tab.cpp.h
 	bison -dtv -p lg  $< -o lg.tab.cpp
-	-mv lg.tab.cpp.h  lg.tab.hpp # pour un  pb entre des versions de bison 
+	-mv -f lg.tab.cpp.h  lg.tab.hpp # pour un  pb entre des versions de bison 
 libfreefem++.dylib: lg.tab.o ../fflib/libff.a
 	g++ -bundle lg.tab.o  ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib
 EXTRA_DIST=lg.ypp

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional