Changeset 1396 for ThirdParty/Glpk


Ignore:
Timestamp:
Aug 1, 2009 2:25:28 PM (10 years ago)
Author:
stefan
Message:

add pkgconfig files

Location:
ThirdParty/Glpk/trunk
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.am

    r1390 r1396  
    173173addlibs_DATA = glpk_addlibs.txt README
    174174
     175pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
     176pkgconfiglib_DATA = glpk.pc
     177
    175178########################################################################
    176179#                         Maintainer Stuff                             #
  • ThirdParty/Glpk/trunk/Makefile.in

    r1390 r1396  
    5959        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
    6060        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    61         $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
     61        $(srcdir)/config_glpk.h.in $(srcdir)/glpk-uninstalled.pc.in \
     62        $(srcdir)/glpk.pc.in $(srcdir)/glpk_addlibs.txt.in \
    6263        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
    6364@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
     
    7374mkinstalldirs = $(install_sh) -d
    7475CONFIG_HEADER = config_glpk.h
    75 CONFIG_CLEAN_FILES = glpk_addlibs.txt
     76CONFIG_CLEAN_FILES = glpk_addlibs.txt glpk.pc glpk-uninstalled.pc
    7677am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7778am__vpath_adj = case $$p in \
     
    8182am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    8283am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    83         "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"
     84        "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
     85        "$(DESTDIR)$(thirdpartyincludedir)"
    8486thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    8587LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     
    121123DIST_SOURCES = $(libcoinglpk_la_SOURCES)
    122124addlibsDATA_INSTALL = $(INSTALL_DATA)
    123 DATA = $(addlibs_DATA)
     125pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
     126DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
    124127thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    125128HEADERS = $(thirdpartyinclude_HEADERS)
     
    248251datadir = @datadir@
    249252exec_prefix = @exec_prefix@
     253glpkmajorver = @glpkmajorver@
     254glpkminorver = @glpkminorver@
    250255have_autoconf = @have_autoconf@
    251256have_automake = @have_automake@
     
    411416addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
    412417addlibs_DATA = glpk_addlibs.txt README
     418pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
     419pkgconfiglib_DATA = glpk.pc
    413420
    414421########################################################################
     
    476483        -rm -f config_glpk.h stamp-h1
    477484glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
     485        cd $(top_builddir) && $(SHELL) ./config.status $@
     486glpk.pc: $(top_builddir)/config.status $(srcdir)/glpk.pc.in
     487        cd $(top_builddir) && $(SHELL) ./config.status $@
     488glpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/glpk-uninstalled.pc.in
    478489        cd $(top_builddir) && $(SHELL) ./config.status $@
    479490install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     
    14171428          rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    14181429        done
     1430install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
     1431        @$(NORMAL_INSTALL)
     1432        test -z "$(pkgconfiglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfiglibdir)"
     1433        @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
     1434          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     1435          f=$(am__strip_dir) \
     1436          echo " $(pkgconfiglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
     1437          $(pkgconfiglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
     1438        done
     1439
     1440uninstall-pkgconfiglibDATA:
     1441        @$(NORMAL_UNINSTALL)
     1442        @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
     1443          f=$(am__strip_dir) \
     1444          echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
     1445          rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
     1446        done
    14191447install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
    14201448        @$(NORMAL_INSTALL)
     
    16141642all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config_glpk.h
    16151643installdirs:
    1616         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     1644        for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    16171645          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    16181646        done
     
    16641692info-am:
    16651693
    1666 install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS \
     1694install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
     1695        install-thirdpartyincludeHEADERS \
    16671696        install-thirdpartylibLTLIBRARIES
    16681697
     
    16961725
    16971726uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    1698         uninstall-thirdpartyincludeHEADERS \
     1727        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    16991728        uninstall-thirdpartylibLTLIBRARIES
    17001729
     
    17081737        install-am install-data install-data-am install-exec \
    17091738        install-exec-am install-info install-info-am install-man \
    1710         install-strip install-thirdpartyincludeHEADERS \
     1739        install-pkgconfiglibDATA install-strip \
     1740        install-thirdpartyincludeHEADERS \
    17111741        install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    17121742        installdirs maintainer-clean maintainer-clean-generic \
     
    17141744        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    17151745        uninstall-addlibsDATA uninstall-am uninstall-info-am \
    1716         uninstall-thirdpartyincludeHEADERS \
     1746        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    17171747        uninstall-thirdpartylibLTLIBRARIES
    17181748
  • ThirdParty/Glpk/trunk/configure

    r1390 r1396  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS GLPKSRCDIR GLPKOBJDIR GLPKDOCDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS GLPKSRCDIR GLPKOBJDIR GLPKDOCDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    1989419894  echo "$as_me:$LINENO: checking GLPK version" >&5
    1989519895echo $ECHO_N "checking GLPK version... $ECHO_C" >&6
    19896   majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    19897   minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    19898   echo "$as_me:$LINENO: result: ${majorver}.${minorver}" >&5
    19899 echo "${ECHO_T}${majorver}.${minorver}" >&6
    19900   if test x$majorver != x4 || test x$minorver != x39 ; then
     19896  glpkmajorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
     19897  glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
     19898  echo "$as_me:$LINENO: result: ${glpkmajorver}.${glpkminorver}" >&5
     19899echo "${ECHO_T}${glpkmajorver}.${glpkminorver}" >&6
     19900  if test x$glpkmajorver != x4 || test x$glpkminorver != x39 ; then
    1990119901    { { echo "$as_me:$LINENO: error: \"Incorrect GLPK version. This build system is made for GLPK 4.39. Please update by rerunning get.GLPK\"" >&5
    1990219902echo "$as_me: error: \"Incorrect GLPK version. This build system is made for GLPK 4.39. Please update by rerunning get.GLPK\"" >&2;}
    1990319903   { (exit 1); exit 1; }; }
    1990419904  fi
     19905
     19906
    1990519907#else
    1990619908#  if test x$coin_has_glpk = xtrue ; then
     
    2197821980
    2197921981
    21980                     ac_config_files="$ac_config_files Makefile glpk_addlibs.txt"
     21982                                        ac_config_files="$ac_config_files Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc"
    2198121983
    2198221984          ac_config_headers="$ac_config_headers config_glpk.h"
     
    2263322635  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2263422636  "glpk_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES glpk_addlibs.txt" ;;
     22637  "glpk.pc" ) CONFIG_FILES="$CONFIG_FILES glpk.pc" ;;
     22638  "glpk-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES glpk-uninstalled.pc" ;;
    2263522639  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2263622640  "config_glpk.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config_glpk.h" ;;
     
    2281922823s,@COIN_HAS_GLPK_TRUE@,$COIN_HAS_GLPK_TRUE,;t t
    2282022824s,@COIN_HAS_GLPK_FALSE@,$COIN_HAS_GLPK_FALSE,;t t
     22825s,@glpkmajorver@,$glpkmajorver,;t t
     22826s,@glpkminorver@,$glpkminorver,;t t
    2282122827s,@COIN_HAS_ZLIB_TRUE@,$COIN_HAS_ZLIB_TRUE,;t t
    2282222828s,@COIN_HAS_ZLIB_FALSE@,$COIN_HAS_ZLIB_FALSE,;t t
  • ThirdParty/Glpk/trunk/configure.ac

    r1390 r1396  
    7373#  touch $MAKEOKFILE
    7474  AC_MSG_CHECKING([GLPK version])
    75   majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    76   minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    77   AC_MSG_RESULT([${majorver}.${minorver}])
    78   if test x$majorver != x4 || test x$minorver != x39 ; then
     75  glpkmajorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
     76  glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
     77  AC_MSG_RESULT([${glpkmajorver}.${glpkminorver}])
     78  if test x$glpkmajorver != x4 || test x$glpkminorver != x39 ; then
    7979    AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.39. Please update by rerunning get.GLPK"])
    8080  fi
     81  AC_SUBST(glpkmajorver)
     82  AC_SUBST(glpkminorver)
    8183#else
    8284#  if test x$coin_has_glpk = xtrue ; then
     
    269271AC_SUBST(GLPKDIR)
    270272
    271 AC_CONFIG_FILES([Makefile glpk_addlibs.txt])
     273AC_CONFIG_FILES([Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc])
    272274AC_CONFIG_HEADER([config_glpk.h])
    273275
Note: See TracChangeset for help on using the changeset viewer.