Changeset 1456

Timestamp:

Nov 29, 2009 3:54:48 PM (11 years ago)

Author:

stefan

Message:

some fixes; rerun autotools

Location:

ThirdParty

Files:

• ASL/branches/BSPsplit/asl-uninstalled.pc.in (modified) (1 diff)
• All/branches/BSPsplit/configure (modified) (8 diffs)
• Mumps/branches/BSPsplit/Makefile.am (modified) (1 diff)
• Mumps/branches/BSPsplit/Makefile.in (modified) (2 diffs)

ThirdParty/ASL/branches/BSPsplit/asl-uninstalled.pc.in

@@ -6 +6 @@
 Version: @PACKAGE_VERSION@
 Libs: ${libdir}/@AMPLSOLVER_A@ @ADDLIBS@
-Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@
+Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers

ThirdParty/All/branches/BSPsplit/configure

@@ -21022 +21022 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21151 +21157 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21280 +21292 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21409 +21427 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21538 +21562 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21667 +21697 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21796 +21832 @@
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
+
 # Check whether --with-coin-instdir or --without-coin-instdir was given.
 if test "${with_coin_instdir+set}" = set; then
@@ -21924 +21966 @@
   if test -n "$PKG_CONFIG" ; then
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+
+    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+    if test -d "$prefix"; then
+      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+
 
 # Check whether --with-coin-instdir or --without-coin-instdir was given.

ThirdParty/Mumps/branches/BSPsplit/Makefile.am

@@ -88 +88 @@
   $(MUMPSDIR)/include/dmumps_c.h \
   $(MUMPSDIR)/include/mumps_compat.h \
-  $(MUMPSDIR)/include/mumps_c_types.h
+  $(MUMPSDIR)/include/mumps_c_types.h \
+  $(MUMPSDIR)/libseq/mpi.h
 
 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps

ThirdParty/Mumps/branches/BSPsplit/Makefile.in

@@ -336 +336 @@
   $(MUMPSDIR)/include/dmumps_c.h \
   $(MUMPSDIR)/include/mumps_compat.h \
-  $(MUMPSDIR)/include/mumps_c_types.h
+  $(MUMPSDIR)/include/mumps_c_types.h \
+  $(MUMPSDIR)/libseq/mpi.h
 
 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
@@ -707 +708 @@
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/$(MUMPSDIR)/include $(distdir)/. $(distdir)/../../BuildTools
+        $(mkdir_p) $(distdir)/$(MUMPSDIR)/include $(distdir)/$(MUMPSDIR)/libseq $(distdir)/. $(distdir)/../../BuildTools
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \