Changeset 1576 for trunk

Timestamp:

Jul 21, 2010 8:49:04 AM (11 years ago)

Author:

stefan

Message:

rerun autotools

File:

• trunk/Clp/configure (modified) (4 diffs)

trunk/Clp/configure

@@ -20635 +20635 @@
 
 
-# assemble search path for pkg-config, if we are in a project setup
-if test x$coin_projectdir = xyes ; then
-  COIN_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
-  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
-  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
-  if test -d "${prefix}"; then
-    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
-  fi
+# assemble search path for pkg-config
+COIN_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
+# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+if test -d "${prefix}"; then
+  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+fi
 
 
@@ -20651 +20650 @@
   withval="$with_coin_instdir"
   if test -d "$withval"; then : ; else
-       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
 echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
    { (exit 1); exit 1; }; }
-     fi
-     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+   fi
+   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
 
 fi;
 
-  # in a classic setup, we want to find uninstalled projects
+if test x$coin_projectdir = xyes ; then
+  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
   # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
   # unfortunately, if the user set prefix, then we do not know where the project base directory is located
@@ -20679 +20679 @@
   fi
 
-
-fi
+fi
+
 
 
@@ -22425 +22425 @@
 
 if test $coin_vpath_config = yes; then
-  coin_vpath_link_files="$coin_vpath_link_files examples/hello.mps"
+  # echo converts newlines in parameter to spaces
+  coin_vpath_link_files="$coin_vpath_link_files `echo examples/hello.mps`"
 fi
 
 
 if test $coin_vpath_config = yes; then
-  coin_vpath_link_files="$coin_vpath_link_files examples/input.130"
+  # echo converts newlines in parameter to spaces
+  coin_vpath_link_files="$coin_vpath_link_files `echo examples/input.130`"
 fi