httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Randy Terbush" <ra...@covalent.net>
Subject HPUX problem
Date Sun, 15 Aug 1999 15:09:39 GMT
I've confirmed that the following change at revision 1.4.2 for
src/Configure is the problem.

I really have to go to that meeting now, so I will check back later or
study this a bit on the plane ride home tonight.



-----Original Message-----
From: Randy Terbush [mailto:randy@Covalent.NET]
Sent: Sunday, August 15, 1999 10:05 AM
To: randy@Covalent.NET
Subject:


Index: src/Configure
===================================================================
RCS file: /var/covalent/.CVS/apache-cvs/apache-1.3/src/Configure,v
retrieving revision 1.341
retrieving revision 1.342
diff -c -r1.341 -r1.342
*** Configure	1999/05/04 01:07:30	1.341
--- Configure	1999/05/04 11:21:07	1.342
***************
*** 331,338 ****
  	OSDIR="os/os2"
  	DEF_WANTHSREGEX=yes
  	OS='EMX OS/2'
! 	CFLAGS="$CFLAGS -DOS2 -Zbsd-signals -Zbin-files -DTCPIPV4 -g"
! 	LDFLAGS="$LDFLAGS -Zexe"
  	LIBS="$LIBS -lsocket -lufc -lbsd"
  	DBM_LIB="-lgdbm"
  	SHELL=sh
--- 331,338 ----
  	OSDIR="os/os2"
  	DEF_WANTHSREGEX=yes
  	OS='EMX OS/2'
!

CFLAGS="$CFLAGS -DOS2 -Zbsd-signals -Zbin-files -Zcrtdll -DTCPIPV4 -g"
! 	LDFLAGS="$LDFLAGS -Zexe -Zcrtdll"
  	LIBS="$LIBS -lsocket -lufc -lbsd"
  	DBM_LIB="-lgdbm"
  	SHELL=sh
***************
*** 947,952 ****
--- 947,954 ----
      SHLIB_SUFFIX_NAME=so
      SHLIB_SUFFIX_DEPTH=all
      SHLIB_EXPORT_FILES=no
+     SHARED_CORE_EP='lib$(TARGET).ep'
+     SHCORE_IMPLIB=''
      case "$PLAT" in
  	*-linux1)
  	    CFLAGS_SHLIB="-fpic"
***************
*** 1169,1174 ****
--- 1171,1189 ----
  	    LDFLAGS_SHLIB_EXPORT="-Zlink=dynamic -Wl,-Bexport"
  	    CFLAGS_SHLIB='-Zpic'
  	    ;;
+ 	*-OS/2*)
+ 	    DEF_SHARED_CORE=yes
+ 	    LDFLAGS_SHLIB="`echo $LDFLAGS|sed -e s/-Zexe//` -Zdll"
+ 	    SHLIB_SUFFIX_NAME=dll
+ 	    SHLIB_SUFFIX_DEPTH=0
+ 	    LD_SHLIB=$CC
+ 	    LD_SHCORE_DEF="ApacheCoreOS2.def"
+ 	    LD_SHCORE_LIBS="$LIBS"
+ 	    LIBS_SHLIB='$(SRCDIR)/ApacheCoreOS2.a -lsocket -lbsd'
+ 	    SHARED_CORE_EP=''
+ 	    SHCORE_IMPLIB='ApacheCoreOS2.a'
+ 	    OS_MODULE_INCLUDE='Makefile.OS2'
+ 	    ;;
  	*)
  	    ##  ok, no known explict support for shared objects
  	    ##  on this platform, but we give not up immediately.
***************
*** 1518,1524 ****
  		    . ./$tmpfile3
  		fi
  		rm -f $tmpfile2 $tmpfile3
! 		if [ "x$ext" != "xso" ]; then
  		    ext=o
  		fi
  	fi
--- 1533,1539 ----
  		    . ./$tmpfile3
  		fi
  		rm -f $tmpfile2 $tmpfile3
! 		if [ "x$ext" != "x$SHLIB_SUFFIX_NAME" ]; then
  		    ext=o
  		fi
  	fi
***************
*** 1526,1536 ****
  		modname=`echo $modbase | sed 's/^.*\///' | \
  			sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
  	fi
! 	if [ "x$ext" != "xso" ]; then
  		echo "Module $modname $modbase.$ext" >>$tmpfile
  	fi
  	#   optionally generate export file for some linkers
! 	if [ "x$ext" = "xso" -a "x$SHLIB_EXPORT_FILES" = "xyes" ]; then
  		echo "$modname" >$modbase.exp
  	fi
  done
--- 1541,1551 ----
  		modname=`echo $modbase | sed 's/^.*\///' | \
  			sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
  	fi
! 	if [ "x$ext" != "x$SHLIB_SUFFIX_NAME" ]; then
  		echo "Module $modname $modbase.$ext" >>$tmpfile
  	fi
  	#   optionally generate export file for some linkers
! 	if [ "x$ext" = "x$SHLIB_SUFFIX_NAME" -a "x$SHLIB_EXPORT_FILES" =
"xyes" ]; then
  		echo "$modname" >$modbase.exp
  	fi
  done
***************
*** 1549,1555 ****
  ####################################################################
  ## Now the SHARED_CHAIN stuff
  ##
- LIBS_SHLIB=''
  if [ "x$using_shlib" = "x1" ] ; then
      if [ "x$RULE_SHARED_CHAIN" = "xdefault" ] ; then
  	RULE_SHARED_CHAIN=$DEF_SHARED_CHAIN
--- 1564,1569 ----
***************
*** 1618,1623 ****
--- 1632,1641 ----
      if [ "x$TLDFLAGS_SHLIB_EXPORT" = "x" ]; then
  	echo "LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" >>
Makefile.config
      fi
+     echo "LD_SHCORE_DEF=$LD_SHCORE_DEF" >> Makefile.config
+     echo "LD_SHCORE_LIBS=$LD_SHCORE_LIBS" >> Makefile.config
+     echo "SHARED_CORE_EP=$SHARED_CORE_EP" >> Makefile.config
+     echo "SHCORE_IMPLIB=$SHCORE_IMPLIB" >> Makefile.config
  fi

  ####################################################################
***************
*** 2006,2012 ****
  	ar cr $@ $(OBJS)
  	$(RANLIB) $@

! .SUFFIXES: .o .so

  .c.o:
  	$(CC) -c $(INCLUDES) $(CFLAGS) $<
--- 2024,2030 ----
  	ar cr $@ $(OBJS)
  	$(RANLIB) $@

! .SUFFIXES: .o .so .dll

  .c.o:
  	$(CC) -c $(INCLUDES) $(CFLAGS) $<
***************
*** 2032,2037 ****
--- 2050,2059 ----
  	    && rm Makefile.new

  EOF
+ 	fi
+
+ 	if [ "x$OS_MODULE_INCLUDE" != "x" ]; then
+ 		echo "include $OS_MODULE_INCLUDE" >> $moddir/Makefile
  	fi

  	$CAT << 'EOF' >> $moddir/Makefile


Mime
View raw message