arif/maui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix OS and OPSYS var handling in configure

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@62 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
gstaples 2006-07-12 23:45:25 +00:00
parent b910ca92cd
commit 26c6561aae
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@ -2224,15 +2224,15 @@ if test "$OS" = "AIX"; then
OPSYS="AIX43"
else
OPSYS="AIX43"
RELEASE=`uname -r`
{ echo "$as_me:$LINENO: WARNING: Unexpected OS release 'AIX4$(RELEASE)', attempting build with OPSYS=$(OPSYS)" >&5
echo "$as_me: WARNING: Unexpected OS release 'AIX4$(RELEASE)', attempting build with OPSYS=$(OPSYS)" >&2;}
RELEASE=`uname -r`
{ echo "$as_me:$LINENO: WARNING: Unexpected OS release 'AIX4$RELEASE', attempting build with OPSYS=$OPSYS" >&5
echo "$as_me: WARNING: Unexpected OS release 'AIX4$RELEASE', attempting build with OPSYS=$OPSYS" >&2;}
fi
else
OPSYS=AIX43
OSLEVEL=`oslevel`
{ echo "$as_me:$LINENO: WARNING: Unexpected AIX level: $(OSLEVEL), attempting build with OPSYS=$(OPSYS)" >&5
echo "$as_me: WARNING: Unexpected AIX level: $(OSLEVEL), attempting build with OPSYS=$(OPSYS)" >&2;}
OSLEVEL=`oslevel`
{ echo "$as_me:$LINENO: WARNING: Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS" >&5
echo "$as_me: WARNING: Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS" >&2;}
fi
elif test "$OS" = "Linux"; then
OPSYS="LINUX"
@ -2253,8 +2253,8 @@ else
OPSYS="LINUX"
OS="LINUX"
{ echo "$as_me:$LINENO: WARNING: Unsupported OS: $(OS), attempting build with OPSYS=$(OPSYS)" >&5
echo "$as_me: WARNING: Unsupported OS: $(OS), attempting build with OPSYS=$(OPSYS)" >&2;}
{ echo "$as_me:$LINENO: WARNING: Unsupported OS: $OS, attempting build with OPSYS=$OPSYS" >&5
echo "$as_me: WARNING: Unsupported OS: $OS, attempting build with OPSYS=$OPSYS" >&2;}
fi
@ -2338,7 +2338,7 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
if pbs-config --prefix 1>/dev/null 2>&1;then
PBSTARGETDIR=`pbs-config --prefix`
else
PBSTARGETDIR='/usr/local';
PBSTARGETDIR='/usr/local'
fi
elif test -f "$PBSTARGETDIR/bin/pbs-config"; then
PBSTARGETDIR=`$PBSTARGETDIR/bin/pbs-config --prefix`
@ -2349,7 +2349,7 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
elif test -f "$PBSTARGETDIR"; then
PBSTARGETDIR=`$PBSTARGETDIR --prefix`
else
PBSTARGETDIR='/usr/local';
PBSTARGETDIR='/usr/local'
fi
if test "$RMTYPE" = ''; then
RMTYPE=PBS
@ -2572,8 +2572,8 @@ if test "$RMTYPE" = "PBS" ;then
PBSLIBS="-L$PBSTARGETDIR/lib -lnet -lpbs"
fi
else
{ { echo "$as_me:$LINENO: error: can't find pbs-config or libnet.a" >&5
echo "$as_me: error: can't find pbs-config or libnet.a" >&2;}
{ { echo "$as_me:$LINENO: error: can't find pbs-config or libpbs.a" >&5
echo "$as_me: error: can't find pbs-config or libpbs.a" >&2;}
{ (exit 1); exit 1; }; }
fi

16
configure.ac
View File

@ -45,13 +45,13 @@ if test "$OS" = "AIX"; then
OPSYS="AIX43"
else
OPSYS="AIX43"
RELEASE=`uname -r`
AC_MSG_WARN([Unexpected OS release 'AIX4$(RELEASE)', attempting build with OPSYS=$(OPSYS)])
RELEASE=`uname -r`
AC_MSG_WARN([Unexpected OS release 'AIX4$RELEASE', attempting build with OPSYS=$OPSYS])
fi
else
OPSYS=AIX43
OSLEVEL=`oslevel`
AC_MSG_WARN([Unexpected AIX level: $(OSLEVEL), attempting build with OPSYS=$(OPSYS)])
OSLEVEL=`oslevel`
AC_MSG_WARN([Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS])
fi
elif test "$OS" = "Linux"; then
OPSYS="LINUX"
@ -72,7 +72,7 @@ else
OPSYS="LINUX"
OS="LINUX"
AC_MSG_WARN([Unsupported OS: $(OS), attempting build with OPSYS=$(OPSYS)])
AC_MSG_WARN([Unsupported OS: $OS, attempting build with OPSYS=$OPSYS])
fi
AC_SUBST(OPSYS)
AC_SUBST(OS)
@ -138,7 +138,7 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
if pbs-config --prefix 1>/dev/null 2>&1;then
PBSTARGETDIR=`pbs-config --prefix`
else
PBSTARGETDIR='/usr/local';
PBSTARGETDIR='/usr/local'
fi
elif test -f "$PBSTARGETDIR/bin/pbs-config"; then
PBSTARGETDIR=`$PBSTARGETDIR/bin/pbs-config --prefix`
@ -149,7 +149,7 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
elif test -f "$PBSTARGETDIR"; then
PBSTARGETDIR=`$PBSTARGETDIR --prefix`
else
PBSTARGETDIR='/usr/local';
PBSTARGETDIR='/usr/local'
fi
if test "$RMTYPE" = ''; then
RMTYPE=PBS
@ -333,7 +333,7 @@ if test "$RMTYPE" = "PBS" ;then
PBSLIBS="-L$PBSTARGETDIR/lib -lnet -lpbs"
fi
else
AC_MSG_ERROR([can't find pbs-config or libnet.a])
AC_MSG_ERROR([can't find pbs-config or libpbs.a])
fi
AC_SUBST(PBSCFLAGS)
AC_SUBST(PBSLDFLAGS)