Changeset 3618


Ignore:
Timestamp:
Jan 28, 2015 8:44:29 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 1362050f62d07541be615813c9f94d85dcaa6e44
end hash code: 8d095acd93f572f8bd9611b329f52bd75b2ee4db

commit 8d095acd93f572f8bd9611b329f52bd75b2ee4db
Author: Brad Bell <bradbell@…>
Date: Wed Jan 28 06:41:45 2015 -0700

configure.ac: Bring configure.ac up to date with some name changes in cppad.pc.in.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r3608 r3618  
    694694AC_MSG_RESULT([cppad_ipopt_nlp libraries: $CPPAD_IPOPT_LIBS])
    695695dnl --------------------------------------------------------------------------
    696 dnl names set here so same cppad.pc.in works for both with cmake and autoconf.
     696dnl Names set here so same cppad.pc.in works for both with cmake and autoconf.
     697dnl (note that autoconf configuration does not allow for Colpack).
    697698dnl
    698699AC_SUBST(cppad_description, "Differentiation of C++ Algorithms")
     
    701702if test "$prefix" == "NONE" ; then
    702703        cppad_pkgconfig_cflags_value="-I$HOME/include"
    703         cppad_libs_value="-L$HOME/lib"
     704        cppad_pkgconfig_libs_value="-L$HOME/lib"
    704705else
    705706        cppad_pkgconfig_cflags_value="-I$prefix/include"
    706         cppad_libs_value="-L$prefix/lib"
     707        cppad_pkgconfig_libs_value="-L$prefix/lib"
    707708fi
    708709if test "$POSTFIX_DIR" != "" ; then
    709710        cppad_pkgconfig_cflags_value="$cppad_cflags_value/$POSTFIX_DIR"
    710         cppad_libs_value="$cppad_libs_value/$POSTFIX_DIR"
     711        cppad_pkgconfig_libs_value="$cppad_pkgconfig_libs_value/$POSTFIX_DIR"
    711712fi
    712713if test "$IPOPT_DIR" == "" ; then
    713         cppad_libs_value=""
    714         cppad_requires_value=""
    715 else
    716         cppad_libs_value="$cppad_libs_value -lcppad_ipopt"
    717         cppad_requires_value="ipopt"
    718 fi
    719 AC_SUBST(cppad_pkgconfig_cflags,   "$cppad_cflags_value")
    720 AC_SUBST(cppad_libs,     "$cppad_libs_value")
    721 AC_SUBST(cppad_requires, "$cppad_requires_value")
     714        cppad_pkgconfig_libs_value=""
     715        cppad_pkgconfig_requires_value=""
     716else
     717        cppad_pkgconfig_libs_value="$cppad_pkgconfig_libs_value -lcppad_ipopt"
     718        cppad_pkgconfig_requires_value="ipopt"
     719fi
     720AC_SUBST(cppad_pkgconfig_cflags,   "$cppad_pkgconfig_cflags_value")
     721AC_SUBST(cppad_pkgconfig_libs,     "$cppad_pkgconfig_libs_value")
     722AC_SUBST(cppad_pkgconfig_requires, "$cppad_pkgconfig_requires_value")
    722723dnl
    723724dnl names set here so cppad.pc-uninstalled works both with cmake and autoconf
Note: See TracChangeset for help on using the changeset viewer.