Changeset 966


Ignore:
Timestamp:
Feb 12, 2011 2:51:35 PM (11 years ago)
Author:
lou
Message:

Replace find with ls to enumerate Cgl/src subdirectories. Avoid problems with
faux-unix on Windows that try to use Microsoft find instead of unix find.

Location:
trunk/Cgl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cgl/configure

    r958 r966  
    2069020690# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    2069120691if test "x${prefix}" = xNONE ; then
    20692   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20693 else
    20694   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20692  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20693else
     20694  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2069520695fi
    2069620696
     
    2070420704   { (exit 1); exit 1; }; }
    2070520705   fi
    20706    COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20706   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2070720707
    2070820708fi;
     
    2079320793         CGLLIB_LIBS="$withval $CGLLIB_LIBS"
    2079420794
     20795       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     20796       if test -z "$PKG_CONFIG" ; then
     20797         COINUTILS_LIBS_INSTALLED="$withval"
     20798         CGLLIB_LIBS_INSTALLED="$withval $CGLLIB_LIBS_INSTALLED"
     20799       fi
    2079520800     fi
    2079620801
     
    2080820813       coin_has_coinutils=yes
    2080920814       COINUTILS_CFLAGS="-I`${CYGPATH_W} $withval`"
    20810        CGLLIB_CFLAGS="$withval $CGLLIB_CFLAGS"
     20815       CGLLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CGLLIB_CFLAGS"
     20816       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     20817       if test -z "$PKG_CONFIG" ; then
     20818         COINUTILS_CFLAGS_INSTALLED="$COINUTILS_CFLAGS"
     20819         CGLLIB_CFLAGS_INSTALLED="$COINUTILS_CFLAGS $CGLLIB_CFLAGS_INSTALLED"
     20820       fi
    2081120821     fi
    2081220822
     
    2082420834       coin_has_coinutils=yes
    2082520835       COINUTILS_DATA="$withval"
     20836       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     20837       if test -z "$PKG_CONFIG" ; then
     20838         COINUTILS_DATA_INSTALLED="$withval"
     20839       fi
    2082620840     fi
    2082720841
     
    2126521279         CGLLIB_LIBS="$withval $CGLLIB_LIBS"
    2126621280
     21281       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21282       if test -z "$PKG_CONFIG" ; then
     21283         OSI_LIBS_INSTALLED="$withval"
     21284         CGLLIB_LIBS_INSTALLED="$withval $CGLLIB_LIBS_INSTALLED"
     21285       fi
    2126721286     fi
    2126821287
     
    2128021299       coin_has_osi=yes
    2128121300       OSI_CFLAGS="-I`${CYGPATH_W} $withval`"
    21282        CGLLIB_CFLAGS="$withval $CGLLIB_CFLAGS"
     21301       CGLLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CGLLIB_CFLAGS"
     21302       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21303       if test -z "$PKG_CONFIG" ; then
     21304         OSI_CFLAGS_INSTALLED="$OSI_CFLAGS"
     21305         CGLLIB_CFLAGS_INSTALLED="$OSI_CFLAGS $CGLLIB_CFLAGS_INSTALLED"
     21306       fi
    2128321307     fi
    2128421308
     
    2129621320       coin_has_osi=yes
    2129721321       OSI_DATA="$withval"
     21322       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21323       if test -z "$PKG_CONFIG" ; then
     21324         OSI_DATA_INSTALLED="$withval"
     21325       fi
    2129821326     fi
    2129921327
     
    2172621754       SAMPLE_LIBS="$withval"
    2172721755
     21756       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21757       if test -z "$PKG_CONFIG" ; then
     21758         SAMPLE_LIBS_INSTALLED="$withval"
     21759
     21760       fi
    2172821761     fi
    2172921762
     
    2174221775       SAMPLE_CFLAGS="-I`${CYGPATH_W} $withval`"
    2174321776
     21777       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21778       if test -z "$PKG_CONFIG" ; then
     21779         SAMPLE_CFLAGS_INSTALLED="$SAMPLE_CFLAGS"
     21780
     21781       fi
    2174421782     fi
    2174521783
     
    2175721795       coin_has_sample=yes
    2175821796       SAMPLE_DATA="$withval"
     21797       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21798       if test -z "$PKG_CONFIG" ; then
     21799         SAMPLE_DATA_INSTALLED="$withval"
     21800       fi
    2175921801     fi
    2176021802
     
    2216222204       NETLIB_LIBS="$withval"
    2216322205
     22206       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22207       if test -z "$PKG_CONFIG" ; then
     22208         NETLIB_LIBS_INSTALLED="$withval"
     22209
     22210       fi
    2216422211     fi
    2216522212
     
    2217822225       NETLIB_CFLAGS="-I`${CYGPATH_W} $withval`"
    2217922226
     22227       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22228       if test -z "$PKG_CONFIG" ; then
     22229         NETLIB_CFLAGS_INSTALLED="$NETLIB_CFLAGS"
     22230
     22231       fi
    2218022232     fi
    2218122233
     
    2219322245       coin_has_netlib=yes
    2219422246       NETLIB_DATA="$withval"
     22247       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22248       if test -z "$PKG_CONFIG" ; then
     22249         NETLIB_DATA_INSTALLED="$withval"
     22250       fi
    2219522251     fi
    2219622252
     
    2261122667         CGLLIB_LIBS="$withval $CGLLIB_LIBS"
    2261222668
     22669       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22670       if test -z "$PKG_CONFIG" ; then
     22671         OSICLP_LIBS_INSTALLED="$withval"
     22672         CGLLIB_LIBS_INSTALLED="$withval $CGLLIB_LIBS_INSTALLED"
     22673       fi
    2261322674     fi
    2261422675
     
    2262622687       coin_has_osiclp=yes
    2262722688       OSICLP_CFLAGS="-I`${CYGPATH_W} $withval`"
    22628        CGLLIB_CFLAGS="$withval $CGLLIB_CFLAGS"
     22689       CGLLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CGLLIB_CFLAGS"
     22690       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22691       if test -z "$PKG_CONFIG" ; then
     22692         OSICLP_CFLAGS_INSTALLED="$OSICLP_CFLAGS"
     22693         CGLLIB_CFLAGS_INSTALLED="$OSICLP_CFLAGS $CGLLIB_CFLAGS_INSTALLED"
     22694       fi
    2262922695     fi
    2263022696
     
    2264222708       coin_has_osiclp=yes
    2264322709       OSICLP_DATA="$withval"
     22710       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22711       if test -z "$PKG_CONFIG" ; then
     22712         OSICLP_DATA_INSTALLED="$withval"
     22713       fi
    2264422714     fi
    2264522715
     
    2307523145       OSICPX_LIBS="$withval"
    2307623146
     23147       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     23148       if test -z "$PKG_CONFIG" ; then
     23149         OSICPX_LIBS_INSTALLED="$withval"
     23150
     23151       fi
    2307723152     fi
    2307823153
     
    2309123166       OSICPX_CFLAGS="-I`${CYGPATH_W} $withval`"
    2309223167
     23168       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     23169       if test -z "$PKG_CONFIG" ; then
     23170         OSICPX_CFLAGS_INSTALLED="$OSICPX_CFLAGS"
     23171
     23172       fi
    2309323173     fi
    2309423174
     
    2310623186       coin_has_osicpx=yes
    2310723187       OSICPX_DATA="$withval"
     23188       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     23189       if test -z "$PKG_CONFIG" ; then
     23190         OSICPX_DATA_INSTALLED="$withval"
     23191       fi
    2310823192     fi
    2310923193
     
    2351123595       OSIGLPK_LIBS="$withval"
    2351223596
     23597       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     23598       if test -z "$PKG_CONFIG" ; then
     23599         OSIGLPK_LIBS_INSTALLED="$withval"
     23600
     23601       fi
    2351323602     fi
    2351423603
     
    2352723616       OSIGLPK_CFLAGS="-I`${CYGPATH_W} $withval`"
    2352823617
     23618       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     23619       if test -z "$PKG_CONFIG" ; then
     23620         OSIGLPK_CFLAGS_INSTALLED="$OSIGLPK_CFLAGS"
     23621
     23622       fi
    2352923623     fi
    2353023624
     
    2354223636       coin_has_osiglpk=yes
    2354323637       OSIGLPK_DATA="$withval"
     23638       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     23639       if test -z "$PKG_CONFIG" ; then
     23640         OSIGLPK_DATA_INSTALLED="$withval"
     23641       fi
    2354423642     fi
    2354523643
     
    2394824046       OSIMSK_LIBS="$withval"
    2394924047
     24048       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24049       if test -z "$PKG_CONFIG" ; then
     24050         OSIMSK_LIBS_INSTALLED="$withval"
     24051
     24052       fi
    2395024053     fi
    2395124054
     
    2396424067       OSIMSK_CFLAGS="-I`${CYGPATH_W} $withval`"
    2396524068
     24069       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24070       if test -z "$PKG_CONFIG" ; then
     24071         OSIMSK_CFLAGS_INSTALLED="$OSIMSK_CFLAGS"
     24072
     24073       fi
    2396624074     fi
    2396724075
     
    2397924087       coin_has_osimsk=yes
    2398024088       OSIMSK_DATA="$withval"
     24089       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24090       if test -z "$PKG_CONFIG" ; then
     24091         OSIMSK_DATA_INSTALLED="$withval"
     24092       fi
    2398124093     fi
    2398224094
     
    2438424496       OSIXPR_LIBS="$withval"
    2438524497
     24498       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24499       if test -z "$PKG_CONFIG" ; then
     24500         OSIXPR_LIBS_INSTALLED="$withval"
     24501
     24502       fi
    2438624503     fi
    2438724504
     
    2440024517       OSIXPR_CFLAGS="-I`${CYGPATH_W} $withval`"
    2440124518
     24519       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24520       if test -z "$PKG_CONFIG" ; then
     24521         OSIXPR_CFLAGS_INSTALLED="$OSIXPR_CFLAGS"
     24522
     24523       fi
    2440224524     fi
    2440324525
     
    2441524537       coin_has_osixpr=yes
    2441624538       OSIXPR_DATA="$withval"
     24539       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24540       if test -z "$PKG_CONFIG" ; then
     24541         OSIXPR_DATA_INSTALLED="$withval"
     24542       fi
    2441724543     fi
    2441824544
     
    2482024946       OSIVOL_LIBS="$withval"
    2482124947
     24948       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24949       if test -z "$PKG_CONFIG" ; then
     24950         OSIVOL_LIBS_INSTALLED="$withval"
     24951
     24952       fi
    2482224953     fi
    2482324954
     
    2483624967       OSIVOL_CFLAGS="-I`${CYGPATH_W} $withval`"
    2483724968
     24969       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24970       if test -z "$PKG_CONFIG" ; then
     24971         OSIVOL_CFLAGS_INSTALLED="$OSIVOL_CFLAGS"
     24972
     24973       fi
    2483824974     fi
    2483924975
     
    2485124987       coin_has_osivol=yes
    2485224988       OSIVOL_DATA="$withval"
     24989       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     24990       if test -z "$PKG_CONFIG" ; then
     24991         OSIVOL_DATA_INSTALLED="$withval"
     24992       fi
    2485324993     fi
    2485424994
     
    2525625396       OSIDYLP_LIBS="$withval"
    2525725397
     25398       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     25399       if test -z "$PKG_CONFIG" ; then
     25400         OSIDYLP_LIBS_INSTALLED="$withval"
     25401
     25402       fi
    2525825403     fi
    2525925404
     
    2527225417       OSIDYLP_CFLAGS="-I`${CYGPATH_W} $withval`"
    2527325418
     25419       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     25420       if test -z "$PKG_CONFIG" ; then
     25421         OSIDYLP_CFLAGS_INSTALLED="$OSIDYLP_CFLAGS"
     25422
     25423       fi
    2527425424     fi
    2527525425
     
    2528725437       coin_has_osidylp=yes
    2528825438       OSIDYLP_DATA="$withval"
     25439       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     25440       if test -z "$PKG_CONFIG" ; then
     25441         OSIDYLP_DATA_INSTALLED="$withval"
     25442       fi
    2528925443     fi
    2529025444
     
    2566025814
    2566125815# In order to avoid that one has to update this configure.ac and the
    25662 # Makefile.am whenever a new cut generator is added, we automatically
    25663 # determine the list of all subdirectories of src with Makefile
    25664 # (CGL_SUBDIRS), and also a list of all sublibraries relative to src
    25665 # (CGL_SUBLIBS) that can be used in the src/Makefile.am.  (We still need
    25666 # to manually add the Makefile in the AC_CONFIG_FILES list below)
     25816# Makefile.am whenever a new cut generator is added, we automatically determine
     25817# the list of all subdirectories of src with a Makefile.in (CGL_SUBDIRS),
     25818# and also a list of all sublibraries relative to src (CGL_SUBLIBS) that
     25819# can be used in the src/Makefile.am.  (It is still necessary to manually
     25820# add an entry to write the Makefile in the AC_CONFIG_FILES list below.)
    2566725821
    2566825822
     
    2567125825curr_dir=`pwd`
    2567225826cd $srcdir/src
    25673 for file in `find . -name Makefile.in`; do
    25674   if test $file != ./Makefile.in; then
    25675     newdir=`echo $file | sed -e s%/Makefile.in%% | sed -e s%^./%% `
    25676     CGL_SUBDIRS="$CGL_SUBDIRS $newdir"
    25677     CGL_SUBLIBS="$CGL_SUBLIBS $newdir/lib${newdir}.la"
    25678   fi
     25827for file in `ls */Makefile.in`; do
     25828  newdir=`echo $file | sed -e s%/Makefile.in%% | sed -e s%^./%% `
     25829  CGL_SUBDIRS="$CGL_SUBDIRS $newdir"
     25830  CGL_SUBLIBS="$CGL_SUBLIBS $newdir/lib${newdir}.la"
    2567925831done
    2568025832cd $curr_dir
  • trunk/Cgl/configure.ac

    r952 r966  
    9595
    9696# In order to avoid that one has to update this configure.ac and the
    97 # Makefile.am whenever a new cut generator is added, we automatically
    98 # determine the list of all subdirectories of src with Makefile
    99 # (CGL_SUBDIRS), and also a list of all sublibraries relative to src
    100 # (CGL_SUBLIBS) that can be used in the src/Makefile.am.  (We still need
    101 # to manually add the Makefile in the AC_CONFIG_FILES list below)
     97# Makefile.am whenever a new cut generator is added, we automatically determine
     98# the list of all subdirectories of src with a Makefile.in (CGL_SUBDIRS),
     99# and also a list of all sublibraries relative to src (CGL_SUBLIBS) that
     100# can be used in the src/Makefile.am.  (It is still necessary to manually
     101# add an entry to write the Makefile in the AC_CONFIG_FILES list below.)
    102102
    103103AC_SUBST(CGL_SUBDIRS)
     
    106106curr_dir=`pwd`
    107107cd $srcdir/src
    108 for file in `find . -name Makefile.in`; do
    109   if test $file != ./Makefile.in; then
    110     newdir=`echo $file | sed -e s%/Makefile.in%% | sed -e s%^./%% `
    111     CGL_SUBDIRS="$CGL_SUBDIRS $newdir"
    112     CGL_SUBLIBS="$CGL_SUBLIBS $newdir/lib${newdir}.la"
    113   fi
     108for file in `ls */Makefile.in`; do
     109  newdir=`echo $file | sed -e s%/Makefile.in%% | sed -e s%^./%% `
     110  CGL_SUBDIRS="$CGL_SUBDIRS $newdir"
     111  CGL_SUBLIBS="$CGL_SUBLIBS $newdir/lib${newdir}.la"
    114112done
    115113cd $curr_dir
Note: See TracChangeset for help on using the changeset viewer.