[Plplot-cvs] plplot/cf aqt.ac,1.1,1.2

[Rafael L. <rla...@us...>]

Update of /cvsroot/plplot/plplot/cf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30382

Modified Files:
	aqt.ac 
Log Message:
Changed the logic of the conditional tests "$enable_aqt" = "yes", such that 
if $enable_aqt becomes "no", PL_ADD_TO_INCS and PL_ADD_TO_LIBS are not
erroneously called.  This was causing problem when configuring with
--disable-shared, wiht the extraneous -ObjC being included in every call to
gcc.


Index: aqt.ac
===================================================================
RCS file: /cvsroot/plplot/plplot/cf/aqt.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aqt.ac	6 Feb 2005 18:25:25 -0000	1.1
+++ aqt.ac	7 Mar 2005 13:29:56 -0000	1.2
@@ -49,6 +49,9 @@
 	    AC_MSG_RESULT([found in $AQTINCDIR])
         fi ])
     fi
+fi
+
+if test "$enable_aqt" = "yes"; then
     if test "$AQTINCDIR" = "/usr/include"; then
         AQTINCDIR=default
     fi
@@ -56,9 +59,6 @@
     AQTINCPATH=""
     PL_ADD_TO_INCS($AQTINCDIR, AQTINCCMD, AQTINCPATH)
 
-fi
-
-if test "$enable_aqt" = "yes"; then
     if test -z "$AQTLIBDIR"; then
         AC_CHECK_LIB(aquaterm, aqtInit, [ AQTLIBDIR=default ], [
         libdirs="\
@@ -78,6 +78,9 @@
 
         fi ], -lobjc)
     fi
+fi
+
+if test "$enable_aqt" = "yes"; then
     if test "$AQTLIBDIR" = "default"; then
         AQTLIBDIR=/usr/lib
     fi