[wpdev-commits] wolfpack/setup.d check,1.3,1.4

[<as...@us...>]

Update of /cvsroot/wpdev/wolfpack/setup.d
In directory sc8-pr-cvs1:/tmp/cvs-serv22828/setup.d

Modified Files:
	check 
Log Message:
ident chars for config script


Index: check
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/setup.d/check,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** check	14 Oct 2003 14:12:56 -0000	1.3
--- check	15 Oct 2003 02:46:49 -0000	1.4
***************
*** 2,5 ****
--- 2,7 ----
  . "$CONFIG_FILE";
  
+ echo "CHECK=\"$0\"" > "$SETUP_CACHE";
+ 
  check_dialog()
  {
***************
*** 9,17 ****
  	if [ -x "$DIALOG" ];
  	then
! 		echo "DIALOG=\"$DIALOG\"" > "$SETUP_CACHE";
  		echo "${DIALOG}.";
  	elif [ -x "$WHIPTAIL" ];
  	then
! 		echo "DIALOG=\"$WHIPTAIL\"" > "$SETUP_CACHE";
  		echo "${WHIPTAIL}.";
  	else
--- 11,19 ----
  	if [ -x "$DIALOG" ];
  	then
! 		echo "DIALOG=\"$DIALOG\"" >> "$SETUP_CACHE";
  		echo "${DIALOG}.";
  	elif [ -x "$WHIPTAIL" ];
  	then
! 		echo "DIALOG=\"$WHIPTAIL\"" >> "$SETUP_CACHE";
  		echo "${WHIPTAIL}.";
  	else
***************
*** 57,62 ****
  	if [ "$MAKE_VERSION" ];
  	then
! 		echo "MAKE_PATH=\"$(which make)\";" >> "$SETUP_CACHE";
! 		echo "MAKE_VERSION=\"$(echo "$MAKE_VERSION"|cut -d' ' -f4)\";" >> "$SETUP_CACHE";
  		echo "${MAKE_VERSION}.";
  	else
--- 59,64 ----
  	if [ "$MAKE_VERSION" ];
  	then
! 		echo "MAKE_PATH=\"$(which make)\"" >> "$SETUP_CACHE";
! 		echo "MAKE_VERSION=\"$(echo "$MAKE_VERSION"|cut -d' ' -f4)\"" >> "$SETUP_CACHE";
  		echo "${MAKE_VERSION}.";
  	else
***************
*** 71,75 ****
  	if [ ! "$QMAKE_PATH" ];
  	then
! 		QMAKE_PATH="which $QTDIR/bin/qmake";
  	fi;
  
--- 73,86 ----
  	if [ ! "$QMAKE_PATH" ];
  	then
! 		if [ "$QTDIR" ];
! 		then
! 			QMAKE_PATH="which $QTDIR/bin/qmake";
! 		else
! 			QMAKE_PATH="which /usr/share/qt3/bin/qmake";
! 			if [ ! "$QMAKE_PATH" ];
! 			then
! 				QMAKE_PATH="which /usr/share/qt/bin/qmake";
! 			fi;
! 		fi;
  	fi;
  
***************
*** 111,115 ****
  	done;
  
! 	echo "${CONF_VAR}_INCDIRS=\"$INCLUDE_DIRLIST\"" >> "$SETUP_CACHE";
  	if [ "$INCLUDE_DIRLIST" ];
  	then
--- 122,126 ----
  	done;
  
! 	echo "${CONF_VAR}_INCDIRS=\"($LIBRARY) $INCLUDE_DIRLIST\"" >> "$SETUP_CACHE";
  	if [ "$INCLUDE_DIRLIST" ];
  	then
***************
*** 149,154 ****
  	done;
  
! 	echo "${CONF_VAR}_LIBDIRS=\"$LIBRARY_DIRLIST\"" >> "$SETUP_CACHE";
! 	echo "${CONF_VAR}_LIBFILES=\"$LIBRARY_FILELIST\"" >> "$SETUP_CACHE";
  
  	if [ "$LIBRARY_DIRLIST" ] && [ "$LIBRARY_FILELIST" ];
--- 160,165 ----
  	done;
  
! 	echo "${CONF_VAR}_LIBDIRS=\"($LIBRARY) $LIBRARY_DIRLIST\"" >> "$SETUP_CACHE";
! 	echo "${CONF_VAR}_LIBFILES=\"($LIBRARY) $LIBRARY_FILELIST\"" >> "$SETUP_CACHE";
  
  	if [ "$LIBRARY_DIRLIST" ] && [ "$LIBRARY_FILELIST" ];
***************
*** 160,169 ****
  }
  
! check_dialog;
! check_gcc;
! check_make;
! check_qmake;
! check_include Python PYTHON /usr/include/python*/Python.h /usr/local/include/python*/Python.h;
! check_lib Python PYTHON /usr/lib/libpython*.so /usr/local/lib/libpython*.so;
  
! echo -e "\e[1;44;32msetup.sh doesn't work currently, yet!\e[m";
--- 171,194 ----
  }
  
! #
! # || -> binary depends
! # ++ -> include depends
! # -- -> library depends
! #
  
! check_dialog; # || GCC
! check_gcc; # || GPP
! check_make; # || MAKE
! check_qmake; # || QMAKE
! 
! check_include Qt QT /usr/include/qt3/qt.h /usr/include/qt/qt.h /usr/local/include/qt3/qt.h /usr/local/include/qt/qt.h /usr/share/qt3/include/qt.h /usr/share/qt/include/qt.h; # ++ QT
! check_lib Qt QT /usr/lib/libqt-mt.so /usr/local/lib/libqt-mt.so /usr/share/qt/lib/libqt-mt.so /usr/share/qt3/lib/libqt-mt.so; # -- QT
! 
! check_include Python PYTHON /usr/include/python*/Python.h /usr/local/include/python*/Python.h; # ++ PYTHON
! check_lib Python PYTHON /usr/lib/libpython*.so /usr/local/lib/libpython*.so; # -- PYTHON
! 
! check_include MySQL MYSQL /usr/include/mysql/mysql.h /usr/local/include/mysql/mysql.h; # ++ MYSQL
! check_lib MySQL MYSQL /usr/lib/libmysqlclient.so /usr/local/lib/libmysqlclient.so; # -- MYSQL
! 
! check_include SQLite SQLITE /usr/include/sqlite.h /usr/local/include/sqlite.h; # ++ SQLITE
! check_lib SQLite SQLITE /usr/lib/libsqlite.so /usr/local/lib/libsqlite.so; # -- SQLITE