Changeset 2050 for stable

Timestamp:

Jan 1, 2011 11:59:34 AM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2049

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (14 diffs)

stable/0.7/coin.m4

@@ -69 +69 @@
 
 AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
-[# Initialize the ADDLIBS variable
-ADDLIBS="-lm $LIBS"
-AC_SUBST(ADDLIBS)
-
-# Initialize the PCADDLIBS variable.
-# This variable is used to setup library flags for the "Libs:" section in a .pc file.
-# In certain cases, it may contain more flags than the ADDLIBS variable.
-PCADDLIBS=""
-AC_SUBST(PCADDLIBS)
-
+[
 # As backup, we make sure we don't loose an FLIBS if it has been set
 # by the user
 save_FLIBS="$FLIBS"
-
-# Initialize the FADDLIBS variable (which is to be used with a fortran
-# compiler and will not include FLIBS)
-FADDLIBS="$LIBS"
-AC_SUBST(FADDLIBS)
 
 # A useful makefile conditional that is always false
@@ -567 +553 @@
 fi
 
+# correct the LD variable in a mingw build with MS or intel compiler
 case "$CXX" in
-  cl* | */cl* | CL* | */CL* )
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     AC_COIN_MINGW_LD_FIX
     ;;
@@ -953 +940 @@
 fi
 
-# Correct ADDLIBS initialization if we are using the MS compiler
+# Correct the LD variable if we are using the MS or Intel-windows compiler
 case "$CC" in
   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-    ADDLIBS=
     AC_COIN_MINGW_LD_FIX
     ;;
@@ -1169 +1155 @@
 fi
 
+# correct the LD variable if we use the intel fortran compiler in windows
 case "$F77" in
   ifort* | */ifort* | IFORT* | */IFORT*)
@@ -1950 +1937 @@
 if test x$coin_skip_ac_output != xyes; then
 
-  FADDLIBS="$ADDLIBS"
-  if test x"$coin_need_flibs" = xyes; then
-    ADDLIBS="$ADDLIBS $FLIBS"
-  fi
-  PCADDLIBS="$PCADDLIBS $ADDLIBS"
-
   # library extension
   AC_SUBST(LIBEXT)
@@ -2112 +2093 @@
   if test $coin_has_zlib = yes; then
     AC_CHECK_LIB([z],[gzopen],
-                 [ADDLIBS="-lz $ADDLIBS"
-                  coin_foreach_w([myvar], [$1], [
+                 [coin_foreach_w([myvar], [$1], [
                     m4_toupper(myvar)_LIBS="-lz $m4_toupper(myvar)_LIBS"
                     m4_toupper(myvar)_PCLIBS="-lz $m4_toupper(myvar)_PCLIBS"
                     m4_toupper(myvar)_LIBS_INSTALLED="-lz $m4_toupper(myvar)_LIBS_INSTALLED"
                   ])
-                 ],
+                 :],
                  [coin_has_zlib=no])
   fi
@@ -2152 +2132 @@
   if test $coin_has_bzlib = yes; then
     AC_CHECK_LIB([bz2],[BZ2_bzReadOpen],
-                 [ADDLIBS="-lbz2 $ADDLIBS"
-                  coin_foreach_w([myvar], [$1], [
+                 [coin_foreach_w([myvar], [$1], [
                     m4_toupper(myvar)_LIBS="-lbz2 $m4_toupper(myvar)_LIBS"
                     m4_toupper(myvar)_PCLIBS="-lbz2 $m4_toupper(myvar)_PCLIBS"
                     m4_toupper(myvar)_LIBS_INSTALLED="-lbz2 $m4_toupper(myvar)_LIBS_INSTALLED"
                   ])
-                 ],
+                 :],
                  [coin_has_bzlib=no])
   fi
@@ -2204 +2183 @@
   if test $coin_has_readline = yes; then
     AC_CHECK_LIB([readline],[readline],
-                 [ADDLIBS="-lreadline $LIBS $ADDLIBS"
-                  coin_foreach_w([myvar], [$1], [
+                 [coin_foreach_w([myvar], [$1], [
                     m4_toupper(myvar)_LIBS="-lreadline $LIBS $m4_toupper(myvar)_LIBS"
                     m4_toupper(myvar)_PCLIBS="-lreadline $LIBS $m4_toupper(myvar)_PCLIBS"
                     m4_toupper(myvar)_LIBS_INSTALLED="-lreadline $LIBS $m4_toupper(myvar)_LIBS_INSTALLED"
                   ])
-                 ],
+                 :],
                  [coin_has_readline=no])
   fi
@@ -2326 +2304 @@
 
 AC_DEFUN([AC_COIN_EXAMPLE_FILES],
-[AC_REQUIRE([AC_COIN_CHECK_GNU_ZLIB])
-AC_REQUIRE([AC_COIN_CHECK_VPATH])
+[AC_REQUIRE([AC_COIN_CHECK_VPATH])
 AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
 AC_REQUIRE([AC_PROG_LN_S])
@@ -2487 +2464 @@
         [if test x"$m4_tolower($1)_libcheck" != xno; then
            coin_save_LIBS="$LIBS"
-           LIBS="$$2LIB $ADDLIBS $5"
+           LIBS="$$2LIB $5"
            coin_$2_link=no
            AC_LANG_PUSH(C)
@@ -2506 +2483 @@
 
 # If we make it this far, we've verified the file and linked the function. Add
-# the necessary link flags to ADDLIBS and $6_{PC}LIBS and define the preprocessor symbol
+# the necessary link flags to $6_{PC}LIBS and define the preprocessor symbol
 # COIN_HAS_LBRY.
 
-    ADDLIBS="$$2LIB $ADDLIBS"
     coin_foreach_w([myvar], [$6], [
       m4_toupper(myvar)_LIBS="$$2LIB $m4_toupper(myvar)_LIBS"
@@ -2718 +2694 @@
 # --coin-instdir, and the directory named in a file ../coin_subdirs.txt
 # or ../../coin_subdirs.txt in a variable COIN_PKG_CONFIG_PATH, which is
-# also AC_SUBST'ed.
+# also AC_SUBST'ed. For a path xxx given in the coin-subdirs.txt, also
+# the directory xxx/pkgconfig is added, if existing.
 
 AC_DEFUN([AC_COIN_HAS_PKGCONFIG],
@@ -2790 +2767 @@
         COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
       fi
+      if test -d ../$i/pkgconfig ; then
+        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
+      fi
     done
   fi
@@ -2797 +2777 @@
       if test -d ../../$i ; then
         COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
+      fi
+      if test -d ../../$i/pkgconfig ; then
+        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
       fi
     done