[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b
goffioul
goffioul at 416fae20-06d0-4450-9b69-c6c34d4b5f03
Mon Jan 3 03:41:11 UTC 2011
The following commit has been merged in the master branch:
commit fb9e7936a96717e757a72a7917dc7035d9f15a75
Author: goffioul <goffioul at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date: Tue May 20 20:20:39 2008 +0000
Fix compilation problems
git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@5075 416fae20-06d0-4450-9b69-c6c34d4b5f03
diff --git a/src/Makeconf.in b/src/Makeconf.in
index c74efd8..dc01077 100644
--- a/src/Makeconf.in
+++ b/src/Makeconf.in
@@ -1,5 +1,5 @@
MKOCTFILE = mkoctfile
-LIBS = -lginac -lcln -lgmp
+LIBS = -lginac -lcln
%.o: %.cc ; $(MKOCTFILE) -c $<
%.oct: %.cc ; $(MKOCTFILE) $(LIBS) $<
diff --git a/src/Makefile b/src/Makefile
index 944bebe..7688188 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,6 +34,6 @@ endif
$(PROGS): Makefile
symbols.oct: $(OBJ)
- $(MKOCTFILE) -v -o $@ $(OBJ) $(GINAC_LIBS)
+ $(MKOCTFILE) -v -o $@ $(OBJ) `pkg-config --libs ginac`
clean: ; $(RM) *.o core octave-core *.oct *~
diff --git a/src/configure.base b/src/configure.base
index c4db95f..21505ea 100644
--- a/src/configure.base
+++ b/src/configure.base
@@ -7,4 +7,4 @@ dnl Checking for ginac library
PKG_CHECK_MODULES(GINAC, ginac, , [AC_MSG_ERROR([GINAC not found])])
dnl Check for gmp library
-AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
+dnl AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
--
octave-symbolic
More information about the Pkg-octave-commit
mailing list