Commit Graph

138 Commits

Author SHA1 Message Date
Daniel Russel 1919a8bd42 fixed empty string passed to gcc and runtime shared lib path now points to the right place after install 2007-03-22 21:06:08 +00:00
Laurent Rineau 10ccff6780 Use 'printf "%s\n"' instead of 'echo -n'. 2007-03-22 14:59:41 +00:00
Laurent Rineau 204ecbba22 - Do not loose part of install.log with the use of --CGAL_DIR.
- Fix a syntax error on Solaris: test -z  needs an argument, so
    [ -z `value_of PROVIDE_PKG_${i}` ]
  needs to be quoted into
    [ -z "`value_of PROVIDE_PKG_${i}`" ]
2007-03-21 00:09:58 +00:00
Daniel Russel ac4bdb4378 log to log for non-interactive installation 2007-03-20 22:30:36 +00:00
Joachim Reichel f233d31cbf add $(strip ...) calls to definitions of CGAL_CXXFLAGS, CGAL_LIBPATHFLAGS,
and CGAL_LDFLAGS
2007-03-20 20:26:34 +00:00
Laurent Rineau ae81a9ff42 Again a major speed-up of parse_support_options(): use only one awk to do the
whole job.

Tested on Linux and Solaris.
2007-03-20 19:54:56 +00:00
Joachim Reichel f038ffdd56 drop support for external CORE 2007-03-20 19:09:33 +00:00
Laurent Rineau 9497f94d67 New shell variable: ${CGAL_LIBS_OPTFLAGS}. Set to "-O2" but for SunCC: Marc
Glisse told me that -O is better for sunCC, because -O is the optimization
level that is the more stable.
2007-03-20 10:29:21 +00:00
Marc Glisse dc3364c65a Basics for sunpro on linux-x86. I will touch FPU.h again later. 2007-03-19 18:25:06 +00:00
Joachim Reichel 78deced48d add missing definitions for shared libraries on *alpha*Linux*g++* 2007-03-19 17:07:22 +00:00
Joachim Reichel 10a1be523a print version number of supported libraries (if known) 2007-03-19 17:02:55 +00:00
Laurent Rineau 2408837793 Fix getconf call: `getconf PATH` is more standard than `getconf CS_PATH`
(Single Unix Specification version 3).
2007-03-19 07:46:40 +00:00
Joachim Reichel 0cbdfe9716 install makefile as $(CGAL_INSTALL_DIR)/share/cgal/makefile
do not install unused subdirectory $(CGAL_INSTALL_DIR)/include/CGAL/config
2007-03-18 11:56:46 +00:00
Joachim Reichel 55438c8c8e fix invocation of _check_for_util from _check_for_sysutil (the former
was looking for a program 'gmake n MAKE' instead of 'gmake')
2007-03-18 10:28:58 +00:00
Daniel Russel f1f153c176 added auto compiler determination to ni, made ni default (removed auto), suppressed warnings when missing config file, cleaned up print out when the config is found 2007-03-16 19:29:11 +00:00
Laurent Rineau db7b7eaf97 Special gift feature for Andreas Fabri: the last line of the output of
install_cgal can now be copy pasted in the shell.

E.g.:

  **   WARNING: You did not build any libs during this session. **
  **     If something went wrong, (or maybe also, if not:)      **
  **                have a look at install.log.                 **
  ****************************************************************

Remember to set the CGAL_MAKEFILE environment variable, e.g.:
export CGAL_MAKEFILE="/usr/share/CGAL/make/makefile"
2007-03-16 16:10:53 +00:00
Laurent Rineau 38ff402c77 Quote more, in the display of "set to ..." in try_to_get_var_from_config_file().
A single quote prevents the shell from interpreting the string.
2007-03-16 15:43:20 +00:00
Laurent Rineau 0eba620f11 - minor modifications of _check_for_(sys)?util():
- one can set variables NO_<utility> (like NO_printf for example) to see
     what happens if an utility is missing (I like using NO_tput=y, for
     example),
   - use of value_of() instead of two eval.
- Add a message at the beginning of the search of POSIX utilities. On
  Cygwin it can take some time.
- Search for GNU/make only in startup (no need for it to see 
  `install_cgal --help`).
- Remove a slash in CGAL_MAKE_DIR.
2007-03-16 15:40:46 +00:00
Laurent Rineau 8a67f904d9 Fix for platforms that do not have 'getconf'.
The trick: use "_check_for_util getconf", before uses of check_for_sysutil.

Tested on Linux and Solaris.
2007-03-14 21:38:18 +00:00
Laurent Rineau 7935f735e0 - Fix _bc_expr() (broken since the beginning of times, probably never used).
- Fix _search_compiler() (I had broken the latter a week ago, with revision
  36838).

- Better function _check_for_sysutil(): it now uses `getconf CS_PATH` to
  search for POSIX utilities in standard directories. If should fix
  install_cgal on Solaris (tested on Linux and Solaris).

- check_for_utils() is now call as soon as possible, to get a POSIX awk
  before the parsing of support config files.

- Fix calls to any utility without using a variable ${_foobar}. Now, only
  the following utilities are used directly:
    /bin/basename
    /bin/date
2007-03-14 19:51:52 +00:00
Laurent Rineau 6d542045f9 Make keys case-insensitive in support_feature_menu(), like in other menus. 2007-03-14 09:42:58 +00:00
Joachim Reichel 4f47903a25 moved src/Core to src/CGALCore
moved include/CORE to include/CGAL/CORE
moved include/OpenNL to include/CGAL/OpenNL
renamed libcore++ to libCGALcore++
2007-03-13 18:10:39 +00:00
Joachim Reichel cd1a040d2e remove -w and -g option of install_cgal
remove makefile variables CGAL_WINDOW_LDFLAGS, CGAL_GEOWIN_LDFLAGS and CGAL_QT_LDFLAGS
(see #1894)
2007-03-09 22:53:24 +00:00
Laurent Rineau 1d90e12229 Allows MAKE="make -j2" ./install_cgal... 2007-03-09 10:28:32 +00:00
Sylvain Pion cb13268b22 Initialize _grep to grep.
Improve detection of PGCC (pgCC or pgcpp).
2007-03-08 17:12:26 +00:00
Laurent Rineau efeb130fad Fix real_which, which was quite stupide. :-) 2007-03-08 10:00:25 +00:00
Laurent Rineau a83c9d3f3a - Repair the detection of GNU make.
- New variables _touch and _grep.
- Check the use of variables ${_util} instead of "util" directly (for
  util=grep,touch,cat,rm).
- Use ${CUSTOM_CXXFLAGS} for tests also.
2007-03-07 10:21:48 +00:00
Laurent Rineau 65ed13d8c9 New test for gmake.
Add /opt/sfw/bin to standard places (Solaris).
Change the meaning of $3 in _check_for_util and _check_for_sysutil.
2007-03-06 09:21:05 +00:00
Sylvain Pion 5994cd4e35 remove buggy the in last commit 2007-03-05 17:59:10 +00:00
Sylvain Pion 39a14e92b8 Add to --help the following : --with-PACKAGE, --PACKAGE_INCL_DIR, --PACKAGE_LIB_DIR. 2007-03-05 17:58:11 +00:00
Laurent Saboret 646b0feaa7 try_to_get_var_from_file() supports now several '=' characters on a line 2007-03-05 11:00:07 +00:00
Laurent Rineau a3fe48756a Fix the comment of try_to_get_var_from_file_aux(). 2007-03-03 16:30:51 +00:00
Laurent Rineau 972fc4250a Optimization:
- printf is a POSIX shell builtin, so _check_for_sysutil should not be
    called for printf

That optimization avoids more than 15000 forks, during an execution of
    ./install_cgal -i
2007-03-03 16:17:07 +00:00
Laurent Rineau c6fe655d14 Optimizations:
- new implementation of try_to_get_var_from_file() and
    try_to_get_var_from_config_file() that allows to parse a whole file at
    once,
  - new implementation of parse_support_options(), that parse each config
    file at whole.
2007-03-03 15:54:41 +00:00
Laurent Rineau c115b38748 Fix last patch rev36791: i forgot two characteres `". 2007-03-03 15:10:53 +00:00
Laurent Rineau 59d45d51af Optimisation: POSIX awk has a function toupper, so no need to pipe it in
${_tr} '[:lower:]' '[:upper:]'.
2007-03-03 14:26:14 +00:00
Sylvain Pion 623020b3ae minor (8%) optimization of the number of calls to tr 2007-03-02 12:58:15 +00:00
Daniel Russel d46a6f58b6 auto install things if no action is specified 2007-03-01 23:43:54 +00:00
Daniel Russel 716be153c6 fixed dylib path on macs, and the makefile is now in make/CGAL and everything is now installed properly. 2007-03-01 23:43:20 +00:00
Fernando Cacciola a06fa41cb9 auto_link.h now centralized and moved into CGAL/auto_link/ folder.
New line at EOF issues in new headers fixed.
2007-03-01 20:15:24 +00:00
Laurent Rineau 467deadec0 Attempt to restore dylibs on Darwin. 2007-02-27 22:12:02 +00:00
Laurent Rineau 7c0add8a8e Test $MAKE even if MAKE=gmake 2007-02-27 22:10:08 +00:00
Laurent Rineau d633b8c7bd - SHARED_LIB_EXT->CGAL_SHARED_LIB_EXT
- printf -> ${_printf} is some places
- display the make command option, in compile.log
2007-02-26 18:16:38 +00:00
Laurent Saboret ab77efc7e1 _test_support() tries to locate third-party libraries (using STDLIBDIRS and LIBTHING) even when STDINCLDIRS and INCLTHING fields are empty) 2007-02-23 15:27:50 +00:00
Daniel Russel e503360191 removed ref to dylib as linking broken when libraries were called foo.dylib, but worked with foo.so--now it is the same as before, except that the install works 2007-02-23 01:02:13 +00:00
Laurent Rineau 8862a968af - fix ADDITIONNAL->ADDITIONAL
- fix flags for Core and CGALQt shared libraries
- add $(CUSTOM_LDFLAGS) to $(CGAL_SHARED_LIB_LDFLAGS)
- move a few flags from $(CGAL_CGAL_LDFLAGS) to $(CGAL_LDFLAGS), so that
  $(CGAL_CGAL_LDFLAGS) only contains -lCGAL (or the equivalent for other
  compilers).
2007-02-23 00:07:51 +00:00
Daniel Russel 9c0306f242 put back SHARED_LIB_EXT and exported it to the makefile to fix an error message on macs 2007-02-22 22:38:28 +00:00
Daniel Russel 1786c9ca1a Use environment CPPFLAGS in addition to CXXFLAGS and don't overwrite the flags when there is no config file. The first change is harmless. The second involves changing the behaviour of the try_to_get_... functions to not clear the variable when they can't load it. I added code to clear the variable before loading when processing for multiple platforms (since it would have been either loaded or cleared anyway), but I haven't been able to check this so thoroughly 2007-02-22 06:54:49 +00:00
Laurent Rineau 6f5296e701 Tiny fix: "untabify" my last patch. 2007-02-21 18:14:36 +00:00
Laurent Rineau 3360cae266 Dirty hack: regenerate the include makefile, so that linker flags of libraries that
failed to compile are not included in CGAL_LDFLAGS.
2007-02-21 18:00:55 +00:00