Skip to content

P
proview
Commit fd8447f0 authored by Claes Sjöfors's avatar Claes Sjöfors
Browse files
Options

PKG_CONFIG_PATH added to config script

parent 2b336f90
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 22 deletions
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @ fd8447f0
...@@ -16,7 +16,6 @@ EOF ...@@ -16,7 +16,6 @@ EOF
pwre_config_check_include() pwre_config_check_include()
{ {
echo -n "...Checking inc $1: "
let i=0 let i=0
let found=0 let found=0
let incfound=0 let incfound=0
...@@ -24,7 +23,7 @@ pwre_config_check_include() ...@@ -24,7 +23,7 @@ pwre_config_check_include()
for file in $4 for file in $4
do do
if test -e $file; then if test -e $file; then
echo "found" echo "...Checking Yes $1"
echo "export PWRE_CONF_$2=1" >> $cfile echo "export PWRE_CONF_$2=1" >> $cfile
if test $3 == "1"; then if test $3 == "1"; then
...@@ -54,13 +53,12 @@ pwre_config_check_include() ...@@ -54,13 +53,12 @@ pwre_config_check_include()
done done
if test $found -eq 0; then if test $found -eq 0; then
echo "not found" echo "...Checking No $1"
fi fi
} }
pwre_config_check_lib() pwre_config_check_lib()
{ {
echo -n "...Checking $1: "
let i=0 let i=0
let found=0 let found=0
let libfound=0 let libfound=0
...@@ -68,7 +66,7 @@ pwre_config_check_lib() ...@@ -68,7 +66,7 @@ pwre_config_check_lib()
for file in $6 for file in $6
do do
if test -e $file; then if test -e $file; then
echo "found" echo "...Checking Yes $1"
echo "export PWRE_CONF_$2=1" >> $cfile echo "export PWRE_CONF_$2=1" >> $cfile
if test $5 == "1"; then if test $5 == "1"; then
...@@ -114,7 +112,7 @@ pwre_config_check_lib() ...@@ -114,7 +112,7 @@ pwre_config_check_lib()
done done
if test $found -eq 0; then if test $found -eq 0; then
echo "not found" echo "...Checking No $1"
echo "export PWRE_CONF_$2=0" >> $cfile echo "export PWRE_CONF_$2=0" >> $cfile
fi fi
} }
...@@ -199,7 +197,7 @@ if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then ...@@ -199,7 +197,7 @@ if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then
exit exit
fi fi
echo "...Checking /bin/bash" echo "...Checking /bin/bash"
if test ! -e /bin/bash; then if test ! -e /bin/bash; then
if test -e /usr/local/bin/bash; then if test -e /usr/local/bin/bash; then
echo "Config error: /bin/bash not found" echo "Config error: /bin/bash not found"
......
src/tools/pwre/src/os_macos/pwre_configure.sh
View file @ fd8447f0
...@@ -16,7 +16,6 @@ EOF ...@@ -16,7 +16,6 @@ EOF
pwre_config_check_include() pwre_config_check_include()
{ {
echo -n "...Checking inc $1: "
let i=0 let i=0
let found=0 let found=0
let incfound=0 let incfound=0
...@@ -24,7 +23,7 @@ pwre_config_check_include() ...@@ -24,7 +23,7 @@ pwre_config_check_include()
for file in $4 for file in $4
do do
if test -e $file; then if test -e $file; then
echo "found" echo "...Checking Yes $1"
echo "export PWRE_CONF_$2=1" >> $cfile echo "export PWRE_CONF_$2=1" >> $cfile
if test $3 == "1"; then if test $3 == "1"; then
...@@ -54,13 +53,12 @@ pwre_config_check_include() ...@@ -54,13 +53,12 @@ pwre_config_check_include()
done done
if test $found -eq 0; then if test $found -eq 0; then
echo "not found" echo "...Checking No $1"
fi fi
} }
pwre_config_check_lib() pwre_config_check_lib()
{ {
echo -n "...Checking $1: "
let i=0 let i=0
let found=0 let found=0
let libfound=0 let libfound=0
...@@ -68,7 +66,7 @@ pwre_config_check_lib() ...@@ -68,7 +66,7 @@ pwre_config_check_lib()
for file in $6 for file in $6
do do
if test -e $file; then if test -e $file; then
echo "found" echo "...Checking Yes $1"
echo "export PWRE_CONF_$2=1" >> $cfile echo "export PWRE_CONF_$2=1" >> $cfile
if test $5 == "1"; then if test $5 == "1"; then
...@@ -114,7 +112,7 @@ pwre_config_check_lib() ...@@ -114,7 +112,7 @@ pwre_config_check_lib()
done done
if test $found -eq 0; then if test $found -eq 0; then
echo "not found" echo "...Checking No $1"
echo "export PWRE_CONF_$2=0" >> $cfile echo "export PWRE_CONF_$2=0" >> $cfile
fi fi
} }
...@@ -199,7 +197,7 @@ if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then ...@@ -199,7 +197,7 @@ if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then
exit exit
fi fi
echo "...Checking /bin/bash" echo "...Checking /bin/bash"
if test ! -e /bin/bash; then if test ! -e /bin/bash; then
if test -e /usr/local/bin/bash; then if test -e /usr/local/bin/bash; then
echo "Config error: /bin/bash not found" echo "Config error: /bin/bash not found"
...@@ -229,7 +227,7 @@ pwre_create_blddir ...@@ -229,7 +227,7 @@ pwre_create_blddir
pwre_create_makedir pwre_create_makedir
pwre_config_init pwre_config_init
#Gtk #Gtk
pwre_config_check_lib gtk GTK gtk gtk 0 /sw/lib/libgtk-x11-2.0.dylib pwre_config_check_lib gtk GTK gtk gtk 0 /sw/lib/libgtk-x11-2.0.dylib
...@@ -278,6 +276,8 @@ rm $pwre_croot/src/exe/rt_prio/src/.${pwre_os}/.${pwre_hw}/makefile ...@@ -278,6 +276,8 @@ rm $pwre_croot/src/exe/rt_prio/src/.${pwre_os}/.${pwre_hw}/makefile
rm $pwre_croot/remote/exe/rs_remote_alcm/src/.${pwre_os}/.${pwre_hw}/makefile rm $pwre_croot/remote/exe/rs_remote_alcm/src/.${pwre_os}/.${pwre_hw}/makefile
#rm $pwre_croot/profibus/lib/rt/src/.${pwre_os}/.${pwre_hw}/makefile #rm $pwre_croot/profibus/lib/rt/src/.${pwre_os}/.${pwre_hw}/makefile
echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $cfile
echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
......
src/tools/pwre/src/os_templ/pwre_configure.sh
View file @ fd8447f0
...@@ -16,7 +16,6 @@ EOF ...@@ -16,7 +16,6 @@ EOF
pwre_config_check_include() pwre_config_check_include()
{ {
echo -n "...Checking inc $1: "
let i=0 let i=0
let found=0 let found=0
let incfound=0 let incfound=0
...@@ -24,7 +23,7 @@ pwre_config_check_include() ...@@ -24,7 +23,7 @@ pwre_config_check_include()
for file in $4 for file in $4
do do
if test -e $file; then if test -e $file; then
echo "found" echo "...Checking Yes $1"
echo "export PWRE_CONF_$2=1" >> $cfile echo "export PWRE_CONF_$2=1" >> $cfile
if test $3 == "1"; then if test $3 == "1"; then
...@@ -54,13 +53,12 @@ pwre_config_check_include() ...@@ -54,13 +53,12 @@ pwre_config_check_include()
done done
if test $found -eq 0; then if test $found -eq 0; then
echo "not found" echo "...Checking No $1"
fi fi
} }
pwre_config_check_lib() pwre_config_check_lib()
{ {
echo -n "...Checking $1: "
let i=0 let i=0
let found=0 let found=0
let libfound=0 let libfound=0
...@@ -68,7 +66,7 @@ pwre_config_check_lib() ...@@ -68,7 +66,7 @@ pwre_config_check_lib()
for file in $6 for file in $6
do do
if test -e $file; then if test -e $file; then
echo "found" echo "...Checking Yes $1"
echo "export PWRE_CONF_$2=1" >> $cfile echo "export PWRE_CONF_$2=1" >> $cfile
if test $5 == "1"; then if test $5 == "1"; then
...@@ -114,7 +112,7 @@ pwre_config_check_lib() ...@@ -114,7 +112,7 @@ pwre_config_check_lib()
done done
if test $found -eq 0; then if test $found -eq 0; then
echo "not found" echo "...Checking No $1"
echo "export PWRE_CONF_$2=0" >> $cfile echo "export PWRE_CONF_$2=0" >> $cfile
fi fi
} }
...@@ -199,7 +197,7 @@ if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then ...@@ -199,7 +197,7 @@ if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then
exit exit
fi fi
echo "...Checking /bin/bash" echo "...Checking /bin/bash"
if test ! -e /bin/bash; then if test ! -e /bin/bash; then
if test -e /usr/local/bin/bash; then if test -e /usr/local/bin/bash; then
echo "Config error: /bin/bash not found" echo "Config error: /bin/bash not found"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7