[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b

[opoplawski]

The following commit has been merged in the master branch:
commit ab619cbed01576c25263f86a5e9e67c7e407446c
Author: opoplawski <opoplawski at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Mon Sep 24 15:12:25 2007 +0000

    Use PKG_CHECK_MODULE variables for ginac library
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@4039 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/src/Makeconf.in b/src/Makeconf.in
index daa122e..7bd3f58 100644
--- a/src/Makeconf.in
+++ b/src/Makeconf.in
@@ -61,6 +61,8 @@ ALTMPATH = @altmpath@
 ALTOPATH = @altopath@
 
 @DEFHAVE_GINAC@ 
+GINAC_CFLAGS = @GINAC_CFLAGS@
+GINAC_LIBS = @GINAC_LIBS@
 
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
diff --git a/src/Makefile b/src/Makefile
index f97861f..944bebe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,12 +18,10 @@ SRC=symbols.cc probably_prime.cc differentiate.cc \
 	op-ex-mat.cc op-ex.cc op-vpa.cc 
 OBJ=$(SRC:.cc=.o)
 
-%.o: %.cc ; $(MKOCTFILE) -v $(GINAC_CPP_FLAGS) $(HAVE_ND_ARRAYS) $(TYPEID_HAS_CLASS) -c $<
+%.o: %.cc ; $(MKOCTFILE) -v $(GINAC_CFLAGS) $(HAVE_ND_ARRAYS) $(TYPEID_HAS_CLASS) -c $<
 
 ifdef HAVE_GINAC
 PROGS=symbols.oct
-	GINAC_CPP_FLAGS=$(shell ginac-config --cppflags)
-	GINAC_LD_FLAGS=$(shell ginac-config --libs)
 
 all: $(PROGS)
 else
@@ -36,6 +34,6 @@ endif
 $(PROGS): Makefile
 
 symbols.oct: $(OBJ)
-	$(MKOCTFILE) -v -o $@ $(OBJ) $(GINAC_LD_FLAGS)
+	$(MKOCTFILE) -v -o $@ $(OBJ) $(GINAC_LIBS)
 
 clean: ; $(RM) *.o core octave-core *.oct *~

-- 
octave-symbolic