You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

493 lines
23 KiB

13a14,15
> # we save any prevous CONFIG_FILE by appending suffix ".old",
> # the new file is built up in CONFIG_TMP then renamed to CONFIG_FILE at the end.
15a18
> CONFIG_TMP="$CONFIG_FILE.part"
20a24,36
> COCOA_EXTLIB_DIR=`pwd`/configuration/ExternalLibs
> export COCOA_EXTLIB_DIR
>
> # Default installation directory and command.
> INSTALL_DIR=/usr/local
> INSTALL="install -S"
> which install > /dev/null
> if [ $? -ne 0 ]
> then
> INSTALL="/bin/cp -f"
> fi
>
>
76,78d91
< ( --with-libreadline=* )
< READLINE_LIB=`echo "$option" | cut -f 2- -d=` ;;
<
84a98,100
> (--no-readline )
> AVOID_READLINE=yes ;;
>
90a107,109
> ( --with-libreadline=* )
> READLINE_LIB=`echo "$option" | cut -f 2- -d=` ;;
>
148a168,175
> ( --prefix=* )
> INSTALL_DIR=`echo "$option" | cut -f 2- -d=`
> if [ \! -d "$INSTALL_DIR" ]
> then
> echo "$0: specified installation directory does not exist: \`$INSTALL_DIR\'"
> exit 1
> fi;;
>
167a195,197
> echo -e " --no-readline\tdo not look for libreadline.a"
> echo -e " --with-libreadline=ARG\tspecify location of the file libreadline.a"
> echo -e "\t\t\t[default is to search for libreadline.a]"
179c209
< echo -e " --prefix=PREFIX\tinstall in PREFIX/include & PREFIX/lib (not yet implemented)"
---
> echo -e " --prefix=PREFIX\tinstall in PREFIX/include & PREFIX/lib"
190a221,227
> if [ "$AVOID_READLINE" = yes -a \! -z "$READLINE_LIB" ]
> then
> echo "$0: incompatible inputs for readline"
> exit 1
> fi
>
>
194a232
>
337a376
> WARNINGS="old GMP (incompat with C++11); $WARNINGS"
342c381
< sleep 5
---
> sleep 1
411c450
< if [ "X$READLINE_LIB" = "X" ]
---
> if [ -z "$AVOID_READLINE" ]
413,426c452,491
< READLINE_LIB=`$SCRIPT_DIR/readline-find-lib.sh`
< if [ $? -ne 0 ]
< then
< echo "Warning: not using readline because"
< echo "$READLINE_LIB"
< READLINE_LIB=
< fi
< else
< if [ \! -f "$READLINE_LIB" -o \! -r "$READLINE_LIB" ]
< then
< echo "WARNING: cannot read supplied libreadline path"
< echo "WARNING: proceeding without readline"
< READLINE_LIB=
< fi
---
> if [ -z "$READLINE_LIB" ]
> then
> # No libreadline specified, so look for an installed version
> $SCRIPT_DIR/readline-try-default.sh > /dev/null 2>& 1
> if [ $? = 0 ]
> then
> HAVE_READLINE=yes
> # Note that -lreadline includes also -lncurses or -ltermcap
> READLINE_LIB="-lreadline"
> else
> WARNINGS="libreadline not installed; $WARNINGS"
> echo "WARNING: readline is not installed"
> fi
> else
> # user specified a libreadline
> if [ \! "/$READLINE_LIB" -ef "$READLINE_LIB" ]
> then
> echo "ERROR: supplied libreadline path is not absolute: $READLINE_LIB"
> exit 1
> fi
> if [ \! -f "$READLINE_LIB" -o \! -r "$READLINE_LIB" ]
> then
> echo "ERROR: cannot read supplied libreadline: $READLINE_LIB"
> exit 1
> fi
> # User supplied abs path to a readable file.
> READLINE_HDR=`$SCRIPT_DIR/readline-find-hdr.sh "$READLINE_LIB"`
> if [ $? -ne 0 ]
> then
> echo "ERROR: cannot find header file for the specified libreadline." > /dev/stderr
> exit 1
> fi
>
> LIBTERMCAP=`$SCRIPT_DIR/readline-check-cxxflags.sh "$READLINE_HDR" "$READLINE_LIB"`
> if [ $? = 0 ]
> then
> HAVE_READLINE=yes
> READLINE_LIB="$READLINE_LIB $LIBTERMCAP"
> fi
> fi
428c493,494
< if [ "X$READLINE_LIB" != "X" ]
---
>
> if [ $HAVE_READLINE = yes ]
430,436c496
< READLINE_INCLUDE=`$SCRIPT_DIR/readline-find-hdr.sh "$READLINE_LIB"`
< $SCRIPT_DIR/readline-check-cxxflags.sh "$READLINE_LIB"
< if [ $? = 0 ]
< then
< HAVE_READLINE=yes
< READLINE_FLAG="-DCoCoA_WITH_READLINE"
< fi
---
> READLINE_FLAG="-DCoCoA_WITH_READLINE"
438a499
>
453a515,518
> if [ $HAVE_QMAKE = no ]
> then
> WARNINGS="no qmake (so no CoCoA5 GUI); $WARNINGS"
> fi
527a593
> WARNINGS="BOOST not found; $WARNINGS"
775a842
> LDFPIC=`$SCRIPT_DIR/fpic-ldflag.sh "$CXX"`
827a895
> # Tell user the compiler and default compilation flags put in the Makefile.
829c897,898
<
---
> echo "The C++ compilation flags are \"$CXXFLAGS_COMMON $CXXFLAGS_DEFAULT\""
> echo
838,843c907,912
< echo "# Makefile configuration for CoCoALib." > "$CONFIG_FILE"
< echo "# Created automatically by the configure script." >> "$CONFIG_FILE"
< echo "# Created on `date \"+%Y-%m-%d at time %H:%M:%S\"`" >> "$CONFIG_FILE"
< echo "# Command was: " >> "$CONFIG_FILE"
< echo "# $ORIG_CMD" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
---
> echo "# Makefile configuration for CoCoALib." > "$CONFIG_TMP"
> echo "# Created automatically by the configure script." >> "$CONFIG_TMP"
> echo "# Created on `date \"+%Y-%m-%d at time %H:%M:%S\"`" >> "$CONFIG_TMP"
> echo "# Command was: " >> "$CONFIG_TMP"
> echo "# $ORIG_CMD" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
845c914
< /bin/cat "$CONFIG_DIR/fixed_part1" >> "$CONFIG_FILE"
---
> /bin/cat "$CONFIG_DIR/fixed_part1" >> "$CONFIG_TMP"
852,854c921,923
< echo "# Version number of CoCoALib we shall build." >> "$CONFIG_FILE"
< echo "VERSION=$VERSION" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
---
> echo "# Version number of CoCoALib we shall build." >> "$CONFIG_TMP"
> echo "VERSION=$VERSION" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
857,870c926,944
< echo "INSTALL=install" >> "$CONFIG_FILE"
< echo "INSTALL_DIR=/usr/local" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
< echo "EXTLIBS=\$(COCOA_ROOT)/configuration/ExternalLibs" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
<
< echo "# Compilation flags common to all cases:" >> "$CONFIG_FILE"
< echo "CXXFLAGS_COMMON=$CXXFLAGS_COMMON" >> "$CONFIG_FILE"
< echo "CXXFLAGS_DEFINES_COMMON=$CXXFLAGS_DEFINES_COMMON" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
<
< echo "####################################################" >> "$CONFIG_FILE"
< echo "### SPECIFIC compilation flags -- CHOOSE ONE ###" >> "$CONFIG_FILE"
< echo "####################################################" >> "$CONFIG_FILE"
---
> echo "Installation options are:"
> echo " directory INSTALL_DIR=$INSTALL_DIR"
> echo " command INSTALL=$INSTALL"
> echo
>
> echo "INSTALL_DIR=$INSTALL_DIR" >> "$CONFIG_TMP"
> echo "INSTALL=$INSTALL" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
> echo "EXTLIBS=\$(COCOA_ROOT)/configuration/ExternalLibs" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
>
> echo "# Compilation flags common to all cases:" >> "$CONFIG_TMP"
> echo "CXXFLAGS_COMMON=$CXXFLAGS_COMMON" >> "$CONFIG_TMP"
> echo "CXXFLAGS_DEFINES_COMMON=$CXXFLAGS_DEFINES_COMMON" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
>
> echo "####################################################" >> "$CONFIG_TMP"
> echo "### SPECIFIC compilation flags -- CHOOSE ONE ###" >> "$CONFIG_TMP"
> echo "####################################################" >> "$CONFIG_TMP"
904,921c978,979
< echo "### Case (1): compile optimized and without debugging" >> "$CONFIG_FILE"
< echo "$HASH_OPT CXXFLAGS_SPECIFIC=$CXXFLAGS_OPT" >> "$CONFIG_FILE"
<
< echo "### Case (2): compile with debugging activated" >> "$CONFIG_FILE"
< echo "$HASH_DEBUG1 CXXFLAGS_SPECIFIC=$CXXFLAGS_DEBUG1" >> "$CONFIG_FILE"
< echo "$HASH_DEBUG1 CXXFLAGS_DEFINES_SPECIFIC=$CXXFLAGS_DEFINES_DEBUG1" >> "$CONFIG_FILE"
<
< echo "### Case (3): compile with full debugging activated" >> "$CONFIG_FILE"
< echo "$HASH_DEBUG2 CXXFLAGS_SPECIFIC=$CXXFLAGS_DEBUG2" >> "$CONFIG_FILE"
< echo "$HASH_DEBUG2 CXXFLAGS_DEFINES_SPECIFIC=$CXXFLAGS_DEFINES_DEBUG2" >> "$CONFIG_FILE"
<
<
< echo "### Case (4): compile with profiling activated" >> "$CONFIG_FILE"
< echo "$HASH_PROFILE CXXFLAGS_SPECIFIC=$CXXFLAGS_PROFILE" >> "$CONFIG_FILE"
<
< # Tell user the default compilation flags put in the Makefile.
< echo "The C++ compilation flags are \"$CXXFLAGS_COMMON $CXXFLAGS_DEFAULT\""
<
---
> echo "### Case (1): compile optimized and without debugging" >> "$CONFIG_TMP"
> echo "$HASH_OPT CXXFLAGS_SPECIFIC=$CXXFLAGS_OPT" >> "$CONFIG_TMP"
923,933c981,1004
< echo >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
< echo "# Actual compilation flags:" >> "$CONFIG_FILE"
< echo "CXXFLAGS=\$(CXXFLAGS_COMMON) \$(CXXFLAGS_SPECIFIC)" >> "$CONFIG_FILE"
< echo "CXXFLAGS_DEFINES=\$(CXXFLAGS_DEFINES_COMMON) \$(CXXFLAGS_DEFINES_SPECIFIC)" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
< echo "######################################################" >> "$CONFIG_FILE"
< echo "# These variables were set by the configure script." >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
< echo "CXX=$CXX" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
---
> echo "### Case (2): compile with debugging activated" >> "$CONFIG_TMP"
> echo "$HASH_DEBUG1 CXXFLAGS_SPECIFIC=$CXXFLAGS_DEBUG1" >> "$CONFIG_TMP"
> echo "$HASH_DEBUG1 CXXFLAGS_DEFINES_SPECIFIC=$CXXFLAGS_DEFINES_DEBUG1" >> "$CONFIG_TMP"
>
> echo "### Case (3): compile with full debugging activated" >> "$CONFIG_TMP"
> echo "$HASH_DEBUG2 CXXFLAGS_SPECIFIC=$CXXFLAGS_DEBUG2" >> "$CONFIG_TMP"
> echo "$HASH_DEBUG2 CXXFLAGS_DEFINES_SPECIFIC=$CXXFLAGS_DEFINES_DEBUG2" >> "$CONFIG_TMP"
>
>
> echo "### Case (4): compile with profiling activated" >> "$CONFIG_TMP"
> echo "$HASH_PROFILE CXXFLAGS_SPECIFIC=$CXXFLAGS_PROFILE" >> "$CONFIG_TMP"
>
>
> echo >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
> echo "# Actual compilation flags:" >> "$CONFIG_TMP"
> echo "CXXFLAGS=\$(CXXFLAGS_COMMON) \$(CXXFLAGS_SPECIFIC)" >> "$CONFIG_TMP"
> echo "CXXFLAGS_DEFINES=\$(CXXFLAGS_DEFINES_COMMON) \$(CXXFLAGS_DEFINES_SPECIFIC)" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
> echo "######################################################" >> "$CONFIG_TMP"
> echo "# These variables were set by the configure script." >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
> echo "CXX=$CXX" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
937,938c1008,1009
< echo "# We use the following GMP installation:" >> "$CONFIG_FILE"
< echo "GMP_VERSION=$GMP_VERSION" >> "$CONFIG_FILE"
---
> echo "# We use the following GMP installation:" >> "$CONFIG_TMP"
> echo "GMP_VERSION=$GMP_VERSION" >> "$CONFIG_TMP"
942,943c1013,1014
< echo "GMP_LIB=\$(EXTLIBS)/lib/libgmp-symlink.a" >> "$CONFIG_FILE"
< echo "GMP_LDLIB=-lgmp-symlink" >> "$CONFIG_FILE"
---
> echo "GMP_LIB=\$(EXTLIBS)/lib/libgmp-symlink.a" >> "$CONFIG_TMP"
> echo "GMP_LDLIB=-lgmp-symlink" >> "$CONFIG_TMP"
946,947c1017,1018
< echo "GMPXX_LIB=\$(EXTLIBS)/lib/libgmpxx-symlink.a" >> "$CONFIG_FILE"
< echo "GMPXX_LDLIB=-lgmpxx-symlink" >> "$CONFIG_FILE"
---
> echo "GMPXX_LIB=\$(EXTLIBS)/lib/libgmpxx-symlink.a" >> "$CONFIG_TMP"
> echo "GMPXX_LDLIB=-lgmpxx-symlink" >> "$CONFIG_TMP"
950c1021
< echo "GMP_LDLIB=-lgmp" >> "$CONFIG_FILE"
---
> echo "GMP_LDLIB=-lgmp" >> "$CONFIG_TMP"
953c1024
< echo "GMPXX_LDLIB=-lgmpxx" >> "$CONFIG_FILE"
---
> echo "GMPXX_LDLIB=-lgmpxx" >> "$CONFIG_TMP"
956c1027
< #### echo "GMP_INC_DIR=\"$GMP_INC_DIR\"" >> "$CONFIG_FILE"
---
> #### echo "GMP_INC_DIR=\"$GMP_INC_DIR\"" >> "$CONFIG_TMP"
958c1029
< #### echo "GMP_INCLUDE=-isystem \$(GMP_INC_DIR)" >> "$CONFIG_FILE"
---
> #### echo "GMP_INCLUDE=-isystem \$(GMP_INC_DIR)" >> "$CONFIG_TMP"
960c1031
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
963,964c1034,1035
< echo "HAVE_QMAKE=$HAVE_QMAKE" >> "$CONFIG_FILE"
< echo >> "$CONFIG_FILE"
---
> echo "HAVE_QMAKE=$HAVE_QMAKE" >> "$CONFIG_TMP"
> echo >> "$CONFIG_TMP"
968,969c1039,1040
< echo "# BOOST settings:" >> "$CONFIG_FILE"
< echo "HAVE_BOOST=$HAVE_BOOST" >> "$CONFIG_FILE"
---
> echo "# BOOST settings:" >> "$CONFIG_TMP"
> echo "HAVE_BOOST=$HAVE_BOOST" >> "$CONFIG_TMP"
973,976c1044,1047
< #### echo "BOOST_INC_DIR=\"$BOOST_INC_DIR\"" >> "$CONFIG_FILE"
< #### echo "BOOST_INCLUDE=-isystem \$(BOOST_INC_DIR)" >> "$CONFIG_FILE"
< #### echo "BOOST_LIBS=-L\"$BOOST_LIB_DIR\" $BOOST_LIBS" >> "$CONFIG_FILE"
< echo "BOOST_LDLIBS=$BOOST_LDLIBS" >> "$CONFIG_FILE"
---
> #### echo "BOOST_INC_DIR=\"$BOOST_INC_DIR\"" >> "$CONFIG_TMP"
> #### echo "BOOST_INCLUDE=-isystem \$(BOOST_INC_DIR)" >> "$CONFIG_TMP"
> #### echo "BOOST_LIBS=-L\"$BOOST_LIB_DIR\" $BOOST_LIBS" >> "$CONFIG_TMP"
> echo "BOOST_LDLIBS=$BOOST_LDLIBS" >> "$CONFIG_TMP"
978c1049
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
983c1054
< echo
---
>
987,989c1058,1060
< echo "# READLINE settings:" >> "$CONFIG_FILE"
< echo "HAVE_READLINE=$HAVE_READLINE" >> "$CONFIG_FILE"
< echo "HAVE_READLINE=$HAVE_READLINE $READLINE_LIB"
---
> echo "# READLINE settings:" >> "$CONFIG_TMP"
> echo "HAVE_READLINE=$HAVE_READLINE" >> "$CONFIG_TMP"
> echo "HAVE_READLINE = $HAVE_READLINE $READLINE_LIB"
992c1063
< echo "READLINE_LDLIBS=-lreadline" >> "$CONFIG_FILE"
---
> echo "READLINE_LDLIBS=$READLINE_LIB" >> "$CONFIG_TMP"
994c1065
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
997,999c1068,1070
< echo "# CDD settings:" >> "$CONFIG_FILE"
< echo "HAVE_CDD=$HAVE_CDD" >> "$CONFIG_FILE"
< echo "HAVE_CDD=$HAVE_CDD $CDD_LIB"
---
> echo "# CDD settings:" >> "$CONFIG_TMP"
> echo "HAVE_CDD=$HAVE_CDD" >> "$CONFIG_TMP"
> echo "HAVE_CDD = $HAVE_CDD $CDD_LIB"
1002,1004c1073,1075
< echo "CDD_LIBS=\$(EXTLIBS)/lib/libcddgmp-symlink.a" >> "$CONFIG_FILE"
< echo "CDD_LDLIBS=-lcddgmp-symlink" >> "$CONFIG_FILE"
< echo "CDD_VERSION=" >> "$CONFIG_FILE"
---
> echo "CDD_LIBS=\$(EXTLIBS)/lib/libcddgmp-symlink.a" >> "$CONFIG_TMP"
> echo "CDD_LDLIBS=-lcddgmp-symlink" >> "$CONFIG_TMP"
> echo "CDD_VERSION=" >> "$CONFIG_TMP"
1006c1077
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
1009,1011c1080,1082
< echo "# FROBBY settings:" >> "$CONFIG_FILE"
< echo "HAVE_FROBBY=$HAVE_FROBBY" >> "$CONFIG_FILE"
< echo "HAVE_FROBBY=$HAVE_FROBBY $FROBBY_LIB"
---
> echo "# FROBBY settings:" >> "$CONFIG_TMP"
> echo "HAVE_FROBBY=$HAVE_FROBBY" >> "$CONFIG_TMP"
> echo "HAVE_FROBBY = $HAVE_FROBBY $FROBBY_LIB"
1015,1017c1086,1088
< echo "FROBBY_LIBS=\$(EXTLIBS)/lib/libfrobby-symlink.a \$(GMPXX_LIB)" >> "$CONFIG_FILE"
< echo "FROBBY_LDLIBS=-lfrobby-symlink" >> "$CONFIG_FILE"
< echo "FROBBY_VERSION=" >> "$CONFIG_FILE"
---
> echo "FROBBY_LIBS=\$(EXTLIBS)/lib/libfrobby-symlink.a \$(GMPXX_LIB)" >> "$CONFIG_TMP"
> echo "FROBBY_LDLIBS=-lfrobby-symlink" >> "$CONFIG_TMP"
> echo "FROBBY_VERSION=" >> "$CONFIG_TMP"
1019c1090
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
1022,1024c1093,1095
< echo "# GFAN settings:" >> "$CONFIG_FILE"
< echo "HAVE_GFAN=$HAVE_GFAN" >> "$CONFIG_FILE"
< echo "HAVE_GFAN=$HAVE_GFAN $GFAN_LIB"
---
> echo "# GFAN settings:" >> "$CONFIG_TMP"
> echo "HAVE_GFAN=$HAVE_GFAN" >> "$CONFIG_TMP"
> echo "HAVE_GFAN = $HAVE_GFAN $GFAN_LIB"
1027,1029c1098,1100
< echo "GFAN_LIBS=\$(EXTLIBS)/lib/libgfan-symlink.a" >> "$CONFIG_FILE"
< echo "GFAN_LDLIBS=-lgfan-symlink" >> "$CONFIG_FILE"
< echo "GFAN_VERSION=" >> "$CONFIG_FILE"
---
> echo "GFAN_LIBS=\$(EXTLIBS)/lib/libgfan-symlink.a" >> "$CONFIG_TMP"
> echo "GFAN_LDLIBS=-lgfan-symlink" >> "$CONFIG_TMP"
> echo "GFAN_VERSION=" >> "$CONFIG_TMP"
1031c1102
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
1034,1036c1105,1107
< echo "# GSL settings:" >> "$CONFIG_FILE"
< echo "HAVE_GSL=$HAVE_GSL" >> "$CONFIG_FILE"
< echo "HAVE_GSL=$HAVE_GSL $GSL_LIB"
---
> echo "# GSL settings:" >> "$CONFIG_TMP"
> echo "HAVE_GSL=$HAVE_GSL" >> "$CONFIG_TMP"
> echo "HAVE_GSL = $HAVE_GSL $GSL_LIB"
1039,1043c1110,1114
< #### echo "GSL_INC_DIR=\"$GSL_INC_DIR\"" >> "$CONFIG_FILE"
< #### echo "GSL_INCLUDE=-I \$(GSL_INC_DIR)" >> "$CONFIG_FILE"
< echo "GSL_LIBS=\$(EXTLIBS)/lib/libgsl-symlink.a" >> "$CONFIG_FILE"
< echo "GSL_LDLIBS=-lgsl-symlink -lblas -llapack" >> "$CONFIG_FILE"
< echo "GSL_VERSION=" >> "$CONFIG_FILE"
---
> #### echo "GSL_INC_DIR=\"$GSL_INC_DIR\"" >> "$CONFIG_TMP"
> #### echo "GSL_INCLUDE=-I \$(GSL_INC_DIR)" >> "$CONFIG_TMP"
> echo "GSL_LIBS=\$(EXTLIBS)/lib/libgsl-symlink.a" >> "$CONFIG_TMP"
> echo "GSL_LDLIBS=-lgsl-symlink -lblas -llapack" >> "$CONFIG_TMP"
> echo "GSL_VERSION=" >> "$CONFIG_TMP"
1045c1116
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
1048,1050c1119,1121
< echo "# Normaliz settings:" >> "$CONFIG_FILE"
< echo "HAVE_NORMALIZ=$HAVE_NORMALIZ" >> "$CONFIG_FILE"
< echo "HAVE_NORMALIZ=$HAVE_NORMALIZ $NORMALIZ_LIB"
---
> echo "# Normaliz settings:" >> "$CONFIG_TMP"
> echo "HAVE_NORMALIZ=$HAVE_NORMALIZ" >> "$CONFIG_TMP"
> echo "HAVE_NORMALIZ = $HAVE_NORMALIZ $NORMALIZ_LIB"
1054,1056c1125,1127
< echo "NORMALIZ_LIBS=\$(EXTLIBS)/lib/libnormaliz-symlink.a \$(GMPXX_LIB)" >> "$CONFIG_FILE"
< echo "NORMALIZ_LDLIBS=-lnormaliz-symlink" >> "$CONFIG_FILE"
< echo "NORMALIZ_VERSION=" >> "$CONFIG_FILE"
---
> echo "NORMALIZ_LIBS=\$(EXTLIBS)/lib/libnormaliz-symlink.a \$(GMPXX_LIB)" >> "$CONFIG_TMP"
> echo "NORMALIZ_LDLIBS=-lnormaliz-symlink" >> "$CONFIG_TMP"
> echo "NORMALIZ_VERSION=" >> "$CONFIG_TMP"
1058c1129
< echo >> "$CONFIG_FILE"
---
> echo >> "$CONFIG_TMP"
1062,1063c1133
< echo "LDLIBS=\$(COCOA_LIB) -L\$(EXTLIBS)/lib \$(FROBBY_LDLIBS) \$(GFAN_LDLIBS) \$(CDD_LDLIBS) \$(GSL_LDLIBS) \$(NORMALIZ_LDLIBS) \$(GMPXX_LDLIB) \$(GMP_LDLIB) \$(SOCKET_LIB) \$(BOOST_LDLIBS) \$(READLINE_LDLIBS)" >> "$CONFIG_FILE"
<
---
> echo "LDLIBS=$LDFPIC \$(COCOA_LIB) -L\$(EXTLIBS)/lib \$(FROBBY_LDLIBS) \$(GFAN_LDLIBS) \$(CDD_LDLIBS) \$(GSL_LDLIBS) \$(NORMALIZ_LDLIBS) \$(GMPXX_LDLIB) \$(GMP_LDLIB) \$(SOCKET_LIB) \$(BOOST_LDLIBS) \$(READLINE_LDLIBS)" >> "$CONFIG_TMP"
1076c1146
< echo "SOCKET_LIB=$SOCKET_LIB" >> "$CONFIG_FILE"
---
> echo "SOCKET_LIB=$SOCKET_LIB" >> "$CONFIG_TMP"
1081,1083c1151
< # Append the second fixed part to $CONFIG_FILE
<
< /bin/cat "$CONFIG_DIR/fixed_part2" >> "$CONFIG_FILE"
---
> # Append the second fixed part to $CONFIG_TMP, then rename to $CONFIG_FILE
1084a1153,1154
> /bin/cat "$CONFIG_DIR/fixed_part2" >> "$CONFIG_TMP"
> /bin/mv "$CONFIG_TMP" "$CONFIG_FILE"
1095c1165
< echo "CoCoALib configuration process complete"
---
> echo "CoCoALib configuration process complete."
1096a1167,1171
> if [ -n "$WARNINGS" ]
> then
> echo "======================================================="
> echo "**WARNINGS** $WARNINGS"
> fi