dgaudet 97/07/19 02:34:34
Modified: src CHANGES Configure
Log:
PR#846: swap order of -lsocks and -lresolv for solaris
Submitted by: "Darren O'Shaughnessy" <[EMAIL PROTECTED]>
Revision Changes Path
1.348 +3 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.347
retrieving revision 1.348
diff -C3 -r1.347 -r1.348
*** CHANGES 1997/07/19 09:02:46 1.347
--- CHANGES 1997/07/19 09:34:32 1.348
***************
*** 1,4 ****
--- 1,7 ----
Changes with Apache 1.3
+
+ *) PORT: -lresolv and -lsocks were in the wrong order for Solaris.
+ ["Darren O'Shaughnessy" <[EMAIL PROTECTED]>] PR#846
*) AddModuleInfo directive for mod_info which allows you to annotate
the output of mod_info. ["Lou D. Langholtz" <[EMAIL PROTECTED]>]
1.113 +3 -3 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.112
retrieving revision 1.113
diff -C3 -r1.112 -r1.113
*** Configure 1997/07/17 17:12:40 1.112
--- Configure 1997/07/19 09:34:32 1.113
***************
*** 658,669 ****
# Set flag and check Makefile for -lsocks line
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
- if [ "$OS" = "Solaris 2" ]; then
- LIBS="$LIBS -lresolv"
- fi
if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then : ;
else
LIBS="$LIBS -L/usr/local/lib -lsocks"
fi
fi
--- 658,669 ----
# Set flag and check Makefile for -lsocks line
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then : ;
else
LIBS="$LIBS -L/usr/local/lib -lsocks"
+ fi
+ if [ "$OS" = "Solaris 2" ]; then
+ LIBS="$LIBS -lresolv"
fi
fi
