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.
159 lines
5.3 KiB
159 lines
5.3 KiB
--- a/configure_xwin
|
|
+++ b/configure_xwin
|
|
@@ -16,17 +16,17 @@
|
|
#----- C++ compiler name
|
|
echo "Input C++ compiler name (e.g. g++, no default)."
|
|
echo -n " :"
|
|
-set cpp_compiler=$<
|
|
+set cpp_compiler=
|
|
|
|
#----- Optimization option of the C++ compiler
|
|
echo "Input optimization option (e.g. -O2, no default)"
|
|
echo -n " :"
|
|
-set optimize=$<
|
|
+set optimize=
|
|
|
|
#----- Input Tcl/Tk window shell name
|
|
echo "Input Tcl/Tk window shell name"
|
|
echo -n " (e.g. wish, no default): "
|
|
-set wish=$<
|
|
+set wish=wish
|
|
|
|
|
|
#-----
|
|
@@ -34,7 +34,7 @@
|
|
echo " (e.g. -I/usr/X11R6/include) "
|
|
echo " Hit return key if path is already set properly. )"
|
|
echo -n " : "
|
|
-set xlib_inc=$<
|
|
+set xlib_inc=
|
|
echo ""
|
|
|
|
|
|
@@ -43,17 +43,17 @@
|
|
echo " (e.g. -L/usr/X11R6/lib) "
|
|
echo " Hit return key if path is already set properly.)"
|
|
echo -n " : "
|
|
-set xlib_lib=$<
|
|
+set xlib_lib=
|
|
echo ""
|
|
|
|
#----- Input directory name to install dawn and DAWN_GUI
|
|
echo "Input directory to install executable files"
|
|
echo -n " (e.g. /usr/local/bin, no default ): "
|
|
-set install_dir=$<
|
|
+set install_dir=
|
|
|
|
#----- Input system name
|
|
echo -n "Select a system (0: Defalut, 1: AIX, 2: IRIX, 3: Solaris, 4: RedHat/FedoraCore): "
|
|
-set sysid=$<
|
|
+set sysid=0
|
|
switch ($sysid)
|
|
case "0":
|
|
set sysname = "Default"
|
|
@@ -80,7 +80,7 @@
|
|
echo "Do you use remote-visualization function? (y/n, no default)"
|
|
echo " (Select n if your compilation fails for FRClientServer.cc)"
|
|
echo -n " : "
|
|
-set ynflag_socket=$<
|
|
+set ynflag_socket=n
|
|
switch ($ynflag_socket)
|
|
case "y":
|
|
set macro_socket = '#define USE_SOCKET'
|
|
@@ -123,14 +123,14 @@
|
|
|
|
echo "### C++ compiler" >> Makefile
|
|
#echo "ifndef CXX" >> Makefile
|
|
-echo "CC = $cpp_compiler" >> Makefile
|
|
+#echo "CC = $cpp_compiler" >> Makefile
|
|
#echo "else" >> Makefile
|
|
-#echo 'CC = $(CXX)' >> Makefile
|
|
+echo 'CC = $(CXX)' >> Makefile
|
|
#echo "endif" >> Makefile
|
|
echo "" >> Makefile
|
|
|
|
echo "### Optimization" >> Makefile
|
|
-echo "OPTIMIZE = $optimize" >> Makefile
|
|
+echo 'OPTIMIZE = $(CXXFLAGS)' >> Makefile
|
|
echo "" >> Makefile
|
|
|
|
echo "### Waring level" >> Makefile
|
|
@@ -152,7 +152,7 @@
|
|
echo "" >> Makefile
|
|
|
|
echo "### Directory where to install executable files" >> Makefile
|
|
-echo "INSTALL_DIR = $install_dir" >> Makefile
|
|
+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin' >> Makefile
|
|
echo "" >> Makefile
|
|
|
|
echo "### Socket libraries to be linked " >> Makefile
|
|
--- a/FRSocketMacro.h
|
|
+++ b/FRSocketMacro.h
|
|
@@ -14,8 +14,8 @@
|
|
#elif defined SOCKET_REDHAT61
|
|
#define CLIENT_ADDR_LENGTH socklen_t
|
|
#else
|
|
- #define CLIENT_ADDR_LENGTH int
|
|
-// #define CLIENT_ADDR_LENGTH size_t
|
|
+// #define CLIENT_ADDR_LENGTH int
|
|
+ #define CLIENT_ADDR_LENGTH size_t
|
|
#endif
|
|
|
|
//----- gethostname
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -13,22 +13,22 @@
|
|
#----- C++ compiler name
|
|
echo "Input C++ compiler name (e.g. g++, no default)."
|
|
echo -n " :"
|
|
-set cpp_compiler=$<
|
|
+set cpp_compiler=
|
|
|
|
#----- Optimization option of the C++ compiler
|
|
echo "Input optimization option (e.g. -O2, no default)"
|
|
echo -n " :"
|
|
-set optimize=$<
|
|
+set optimize=
|
|
|
|
#----- Input Tcl/Tk window shell name
|
|
echo "Input Tcl/Tk window shell name"
|
|
echo -n " (e.g. wish, no default): "
|
|
-set wish=$<
|
|
+set wish=wish
|
|
|
|
#----- Input directory name to install dawn and DAWN_GUI
|
|
echo "Input directory to install executable files"
|
|
echo -n " (e.g. /usr/local/bin, no default ): "
|
|
-set install_dir=$<
|
|
+set install_dir=
|
|
|
|
|
|
##### DELETE #####
|
|
@@ -57,14 +57,14 @@
|
|
|
|
echo "### C++ compiler" >> Makefile
|
|
#echo "ifndef CXX" >> Makefile
|
|
-echo "CC = $cpp_compiler" >> Makefile
|
|
+#echo "CC = $cpp_compiler" >> Makefile
|
|
#echo "else" >> Makefile
|
|
-#echo 'CC = $(CXX)' >> Makefile
|
|
+echo 'CC = $(CXX)' >> Makefile
|
|
#echo "endif" >> Makefile
|
|
echo "" >> Makefile
|
|
|
|
echo "### Optimization" >> Makefile
|
|
-echo "OPTIMIZE = $optimize" >> Makefile
|
|
+echo 'OPTIMIZE = $(CXXFLAGS)' >> Makefile
|
|
echo "" >> Makefile
|
|
|
|
echo "### Waring level" >> Makefile
|
|
@@ -78,7 +78,7 @@
|
|
|
|
|
|
echo "### Directory where to install executable files" >> Makefile
|
|
-echo "INSTALL_DIR = $install_dir" >> Makefile
|
|
+echo 'INSTALL_DIR = $(DESTDIR)/usr/bin' >> Makefile
|
|
echo "" >> Makefile
|
|
|
|
echo "" >> Makefile
|