Pwlib/openh323 patches

From: Frederic Crozat <fcrozat mandrakesoft com>
To: desktop-devel-list gnome org
Cc: dsandras seconix com, jdub perkypants org
Subject: Pwlib/openh323 patches
Date: Wed, 03 Sep 2003 17:28:02 +0200

Here is a list of patches we are using at MandrakeSoft to ease
pwlib/openh323 packaging (very useful for gnomemeeting)..
Most of them are caused by pwlib/openh323 not supporting well install
destination being different from build location (usually the case for
RPM packaging..)

They might interest more people and maybe should be merged upstream :

# make sure soname of pwlib is not dependent of platform/etc..
pwlib-1.2.12-libname.patch

# Use system regex() and thus getting rid of non PIC code (from Rawhide)
pwlib-1.3.11-libc-regex.patch

# let is be lib64 safe 
pwlib-1.5.0-lib64.patch

# (florin) 1.5.0-1mdk fix compilation warning with gcc 3.3 by removing
the PINLINE (Seconix)
pwlib-1.5.0-pinline.patch
pwlib-1.5.0-pat.patch

#fix make PREFIX=... install
pwlib-1.5.0-install.patch

#fix pwlib prefix
pwlib-1.5.0-pwlibdir.patch

#use installed asnparser (not the one from the tarball)
openh323-1.12.0-mak_files.patch

#same as for pwlib
openh323-1.12.0-libname.patch

#add -PIC for libraries (needed for some arch)
openh323-1.12.0-pic.patch

#be lib64 friendly
openh323-1.12.0-lib64.patch

#fix make PREFIX=... install
openh323-1.12.0-fixinstall.patch


-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

diff -urN pwlib/make/unix.mak pwlib-modified/make/unix.mak
--- pwlib/make/unix.mak	Thu Jan 31 08:25:29 2002
+++ pwlib-modified/make/unix.mak	Mon Feb 25 13:33:58 2002
@@ -1062,13 +1062,13 @@
 PW_LIBDIR	= $(PWLIBDIR)/lib
 
 # set name of the PT library
-PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+PTLIB_BASE	= pt
 PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
 PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
 PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
 
 # set name of the PW library (may not be used)
-PWLIB_BASE	= pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+PWLIB_BASE	= pw
 PWLIB_FILE	= lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
 PW_OBJBASE	= obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
 PW_OBJDIR	= $(PW_LIBDIR)/$(PW_OBJBASE)

--- pwlib/src/ptlib/common/contain.cxx.libc-regex	2002-06-27 02:59:34.000000000 -0400
+++ pwlib/src/ptlib/common/contain.cxx	2002-12-01 15:37:57.000000000 -0500
@@ -455,8 +455,12 @@ extern "C" int vsprintf(char *, const ch
 #endif
 
 #if !P_MACOS
+#ifdef  P_LINUX
+#include <regex.h>
+#else
 #include "regex/regex.h"
 #endif
+#endif
 
 #if !P_USE_INLINES
 #include "ptlib/contain.inl"
--- pwlib/src/ptlib/unix/Makefile.libc-regex	2002-06-27 01:39:34.000000000 -0400
+++ pwlib/src/ptlib/unix/Makefile	2002-12-01 15:37:57.000000000 -0500
@@ -490,8 +490,10 @@ SOURCES	= \
 	$(COMMON_SRC_DIR)/object.cxx   # must be last module
 
 ifneq ($(OSTYPE),Carbon)
+ifneq ($(OSTYPE),linux)
 OBJS	= $(OBJDIR)/regcomp.o $(OBJDIR)/regexec.o $(OBJDIR)/regerror.o $(OBJDIR)/regfree.o
 endif
+endif
 
 CLEAN_FILES = $(GETDATE_SOURCE)

--- pwlib-1.5.0/make/unix.mak.lib64	2003-06-26 11:10:25.000000000 +0200
+++ pwlib-1.5.0/make/unix.mak	2003-06-26 11:10:25.000000000 +0200
@@ -324,9 +324,13 @@
 endif # PROG
 endif # P_SHAREDLIB
 
+LIB_NAME       := lib
+ifeq ($(MACHTYPE),x86_64)
+LIB_NAME       := lib64
+endif
 
 STATIC_LIBS	:= libstdc++.a libg++.a libm.a libc.a
-SYSLIBDIR	:= /usr/lib
+SYSLIBDIR	:= /usr/$(LIB_NAME)
 #LDFLAGS	+= --no-whole-archive --cref
 STDCCFLAGS      += -DP_USE_PRAGMA
 
@@ -854,7 +858,7 @@
 endif
 
 ifndef INSTALLLIB_DIR
-INSTALLLIB_DIR	= $(INSTALL_DIR)/lib
+INSTALLLIB_DIR	= $(INSTALL_DIR)/$(LIB_NAME)
 endif
 
 
@@ -881,7 +885,11 @@
 UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
 endif
 
+ifdef PWLIB_BUILD
 PW_LIBDIR	= $(PWLIBDIR)/lib
+else
+PW_LIBDIR = $(PWLIBDIR)/$(LIB_NAME)
+endif
 
 # set name of the PT library
 PTLIB_BASE	= pt
@@ -930,7 +938,7 @@
 # define ESDDIR variables if installed
 ifdef  ESDDIR
 STDCCFLAGS	+= -I$(ESDDIR)/include -DUSE_ESD=1
-ENDLDLIBS	+= $(ESDDIR)/lib/libesd.a  # to avoid name conflicts
+ENDLDLIBS	+= $(ESDDIR)/$(LIB_NAME)/libesd.a  # to avoid name conflicts
 HAS_ESD		= 1
 endif
 
--- pwlib-1.5.0/Makefile.in.lib64	2003-05-22 14:13:44.000000000 +0200
+++ pwlib-1.5.0/Makefile.in	2003-06-26 11:27:01.000000000 +0200
@@ -164,7 +164,7 @@
 
 install:
 	chmod a+r lib/* SHAREDLIBEXT@*
-	cp -df lib/* SHAREDLIBEXT@* $(PREFIX)/lib/
+	cp -df lib/* SHAREDLIBEXT@* $(PREFIX)/$(LIB_NAME)
 	cp -rf include/ptclib/ $(PREFIX)/include/
 	cp -rf include/ptlib/ $(PREFIX)/include/
 	cp -rf include/ptbuildopts.h $(PREFIX)/include/
@@ -173,13 +173,13 @@
 	cp make/ptlib-config $(PREFIX)/bin/
 	mkdir -p $(PREFIX)/share/pwlib/
 	cp -rf make $(PREFIX)/share/pwlib/
-	ln -s $(PREFIX)/lib/$(PTLIB_FILE) $(PREFIX)/lib/libpt  SHAREDLIBEXT@
+	ln -s $(PREFIX)/$(LIB_NAME)/$(PTLIB_FILE) $(PREFIX)/$(LIB_NAME)/libpt  SHAREDLIBEXT@
 	chmod -R a+r $(PREFIX)/include/ptlib $(PREFIX)/include/ptclib $(PREFIX)/include/ptlib.h $(PREFIX)/share/pwlib $(PREFIX)/include/ptbuildopts.h $(PREFIX)/include/ptlib.h
 	chmod a+rx $(PREFIX)/include/ptlib $(PREFIX)/include/ptlib/unix $(PREFIX)/include/ptlib/unix/ptlib $(PREFIX)/include/ptclib $(PREFIX)/bin/ptlib-config $(PREFIX)/share/pwlib/make/
 
 uninstall:
 	rm -rf $(PREFIX)/include/ptlib $(PREFIX)/include/ptclib $(PREFIX)/include/ptlib.h $(PREFIX)/include/ptbuildopts.h $(PREFIX)/share/pwlib/ 
-	rm -f $(PREFIX)/lib/$(PTLIB_FILE)* $(PREFIX)/lib/libpt.so $(PREFIX)/bin/asnparser $(PREFIX)/bin/ptlib-config
+	rm -f $(PREFIX)/$(LIB_NAME)/$(PTLIB_FILE)* $(PREFIX)/$(LIB_NAME)/libpt.so $(PREFIX)/bin/asnparser $(PREFIX)/bin/ptlib-config
 
 
 # End of Makefile.in

--- pwlib-1.5.0/make/lib.mak.pat	2003-05-29 11:03:36.000000000 +0200
+++ pwlib-1.5.0/make/lib.mak	2003-06-26 15:45:03.000000000 +0200
@@ -173,7 +173,7 @@
     LD = ld
   else
     ifneq ($(OSTYPE),Darwin)
-      LDSOOPTS += -Wl,-soname,$(LIBNAME_MIN)
+      LDSOOPTS += -Wl,-soname,$(LIBNAME_MAJ)
     endif
     LD = $(CPLUS)
   endif
--- pwlib-1.5.0/make/lib.mak~.pat	2003-06-26 15:27:34.000000000 +0200
+++ pwlib-1.5.0/make/lib.mak~	2003-06-26 15:27:34.000000000 +0200
@@ -0,0 +1,209 @@
+#
+# lib.mak
+#
+# Make rules for building libraries rather than applications.
+#
+# Portable Windows Library
+#
+# Copyright (c) 1993-1998 Equivalence Pty. Ltd.
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is Portable Windows Library.
+#
+# The Initial Developer of the Original Code is Equivalence Pty. Ltd.
+#
+# Contributor(s): ______________________________________.
+#       
+# $Log: lib.mak,v $
+# Revision 1.33  2003/05/29 09:03:36  rjongbloed
+# Changed SONAME so includes minor version number to allow for API changes.
+#
+# Revision 1.32  2003/05/06 09:47:20  robertj
+# Fixed up MacOSX changes so is compatible with previous "API" not requiring
+#   downstream libraries to change
+#
+# Revision 1.31  2003/05/06 06:59:12  robertj
+# Dynamic library support for MacOSX, thanks Hugo Santos
+#
+# Revision 1.30  2002/11/22 10:14:07  robertj
+# QNX port, thanks Xiaodan Tang
+#
+# Revision 1.29  2002/10/17 13:44:27  robertj
+# Port to RTEMS, thanks Vladimir Nesic.
+#
+# Revision 1.28  2002/09/26 00:17:48  robertj
+# Fixed make install to force creation of symlinks, thanks Pierre.
+#
+# Revision 1.27  2002/08/30 11:42:46  robertj
+# Added formatting.
+# Changed alpha & beta sharable library file name convention.
+#
+# Revision 1.26  2002/02/01 11:11:27  rogerh
+# Use .$(MAJOR_VERSION) with soname (instead of hard coding .1)
+#
+# Revision 1.25  2002/01/31 06:55:22  robertj
+# Removed redundant inclusion of ssl, is already in unix.mak
+#
+# Revision 1.24  2002/01/27 08:45:50  rogerh
+# FreeBSD and OpwnBSD use -pthread and not -lpthread
+#
+# Revision 1.23  2002/01/26 23:57:08  craigs
+# Changed for GCC 3.0 compatibility, thanks to manty manty net
+#
+# Revision 1.22  2002/01/15 07:47:30  robertj
+# Fixed previous fix
+#
+# Revision 1.21  2002/01/14 23:14:29  robertj
+# Added ENDLDFLAGS to shared library link, thanks Paul a écrit
+#
+# Revision 1.20  2001/12/18 04:12:08  robertj
+# Fixed Linux compatibility of previous change for Solaris.
+#
+# Revision 1.19  2001/12/17 23:33:50  robertj
+# Solaris 8 porting changes, thanks James Dugal
+#
+# Revision 1.18  2001/12/05 08:32:06  rogerh
+# ln -sf complains if the file already exists on Solaris. So do rm -f first
+#
+# Revision 1.17  2001/12/01 17:41:07  rogerh
+# Use locall defined compiler binary instead of hard coded gcc
+#
+# Revision 1.16  2001/11/30 00:37:16  robertj
+# Fixed incorrect library filename when building static library during shared
+#   library build.
+#
+# Revision 1.15  2001/11/27 22:42:13  robertj
+# Changed to make system to better support non-shared library building.
+#
+# Revision 1.14  2001/07/07 06:51:52  robertj
+# Added fix to remove shared libraries in make clean, thanks Jac Goudsmit
+#
+# Revision 1.13  2001/07/03 04:41:25  yurik
+# Corrections to Jac's submission from 6/28
+#
+# Revision 1.12  2001/06/30 06:59:06  yurik
+# Jac Goudsmit from Be submit these changes 6/28. Implemented by Yuri Kiryanov
+#
+# Revision 1.11  2001/03/23 03:18:01  robertj
+# Fixed addition of trailing dot at end of release versions of so libraries
+#   caused to removal of the "pl" build type, changing it to a dot.
+#
+# Revision 1.10  2001/03/14 06:24:55  robertj
+# Fixed setting of symlinks for shared libraries to be relative paths.
+#
+# Revision 1.9  2000/05/19 01:26:31  robertj
+# Added copyright notice
+#
+
+ifneq ($(OSTYPE),Darwin)
+  LIBNAME_MAJ	= $(LIB_FILENAME).$(MAJOR_VERSION)
+  LIBNAME_MIN	= $(LIBNAME_MAJ).$(MINOR_VERSION)
+  ifeq ($(BUILD_TYPE),.)
+    LIBNAME_PAT	= $(LIBNAME_MIN).$(BUILD_NUMBER)
+  else
+    LIBNAME_PAT	= $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
+  endif
+else
+  LIBNAME_MAJ	= $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME))
+  LIBNAME_MIN	= $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME))
+  ifeq ($(BUILD_TYPE),.)
+    LIBNAME_PAT	= $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER).$(LIB_SUFFIX),$(LIB_FILENAME))
+  else
+    LIBNAME_PAT	= $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(MINOR_VERSION)-$(BUILD_TYPE)$(BUILD_NUMBER).$(LIB_SUFFIX),$(LIB_FILENAME))
+  endif
+endif
+
+CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_FILENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)
+
+ifneq ($(P_SHAREDLIB),1)
+  STATIC_LIB_FILE = $(LIBDIR)/$(LIB_FILENAME)
+else
+  STATIC_LIB_FILE = $(LIBDIR)/$(subst .$(LIB_SUFFIX),_s.$(STATICLIBEXT),$(LIB_FILENAME))
+endif
+
+$(LIBDIR)/$(LIB_FILENAME) : $(TARGETLIB)
+
+ifeq ($(P_SHAREDLIB),1)
+
+  ifeq ($(OSTYPE),beos)
+    # BeOS requires different options when building shared libraries
+    # Also, when building a shared library x that references symbols in libraries y,
+    # the y libraries need to be added to the linker command
+    LDSOOPTS = -nostdlib -nostart
+    EXTLIBS = $(SYSLIBS) -lstdc++.r4
+  else
+    ifeq ($(OSTYPE),Darwin)
+      LDSOOPTS = -dynamiclib
+    else
+      LDSOOPTS = -shared
+    endif
+  endif
+
+  ifeq ($(OSTYPE),rtems)
+    EXTLIBS = -lstdc++
+  endif
+
+  ifneq ($(OSTYPE), QNX)
+    ifneq (,$(findstring $(OSTYPE),FreeBSD OpenBSDs))
+      ifdef P_PTHREADS
+        EXTLIBS += -pthread
+      endif
+    else
+      ifdef P_PTHREADS
+        EXTLIBS += -lpthread
+      endif
+    endif
+  endif
+
+  # Solaris loader doesn't grok -soname  (sees it as -s -oname)
+  # We could use -Wl,-h,$(LIB_BASENAME).1 but then we find that the arglist
+  # to gcc is 2900+ bytes long and it will barf.  I fix this by invoking ld
+  # directly and passing it the equivalent arguments   jpd louisiana edu
+  ifeq ($(OSTYPE),solaris)
+    LDSOOPTS = -Bdynamic -G -h $(LIBNAME_MIN)
+    LD = ld
+  else
+    ifneq ($(OSTYPE),Darwin)
+      LDSOOPTS += -Wl,-soname,$(LIBNAME_MIN)
+    endif
+    LD = $(CPLUS)
+  endif
+
+  $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
+	cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
+	cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ;  ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
+	cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ;  ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
+
+  $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
+	@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
+	$(LD) $(LDSOOPTS) -o $(LIBDIR)/$(LIBNAME_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(ENDLDLIBS)
+
+  install: $(LIBDIR)/$(LIBNAME_PAT)
+	$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
+	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
+	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
+	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
+
+endif # P_SHAREDLIB
+
+
+$(STATIC_LIB_FILE): $(OBJS)
+	@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
+	$(ARCHIVE) $(STATIC_LIB_FILE) $(OBJS)
+ifeq ($(P_USE_RANLIB),1)
+	$(RANLIB) $(STATIC_LIB_FILE)
+endif
+
+
+
+# End of file ################################################################
+

diff -urN pwlib-1.5.0/include/ptlib/pdirect.h pwlib-1.5.0-modified/include/ptlib/pdirect.h
--- pwlib-1.5.0/include/ptlib/pdirect.h	2002-11-20 01:13:43.000000000 +0100
+++ pwlib-1.5.0-modified/include/ptlib/pdirect.h	2003-06-17 17:38:47.000000000 +0200
@@ -453,7 +453,7 @@
        @return
        TRUE if directory was deleted.
      */
-    PINLINE static BOOL Remove(
+    static BOOL Remove(
       const PString & path   /// Directory file path.
     );
   //@}

diff -uNr openh323/Makefile openh323-modified/Makefile
--- openh323/Makefile	2002-12-04 20:36:30.000000000 +0100
+++ openh323-modified/Makefile	2003-01-17 17:49:46.000000000 +0100
@@ -213,11 +213,10 @@
 
 include $(OPENH323DIR)/openh323u.mak
 
-
 # export NOAUDIOCODECS=true
 # export NOVIDEO=true
 
-SUBDIRS := src samples/simple
+SUBDIRS := src
 
 ifneq (,$(wildcard dump323))
 SUBDIRS += dump323
diff -uNr openh323/openh323u.mak openh323-modified/openh323u.mak
--- openh323/openh323u.mak	2002-11-26 11:24:54.000000000 +0100
+++ openh323-modified/openh323u.mak	2003-01-17 17:53:00.000000000 +0100
@@ -122,7 +122,7 @@
 
 
 ifdef LIBRARY_MAKEFILE
-include $(PWLIBDIR)/make/unix.mak
+include $(PWLIBDIR)/share/pwlib/ptlib.mak
 else
 ifdef NOTRACE
 OBJDIR_SUFFIX := n
diff -uNr openh323/src/Makefile openh323-modified/src/Makefile
--- openh323/src/Makefile	2002-11-27 12:52:37.000000000 +0100
+++ openh323-modified/src/Makefile	2003-01-17 17:55:41.000000000 +0100
@@ -321,6 +321,8 @@
 LIBRARY_MAKEFILE:=1
 
 include $(OPENH323DIR)/openh323u.mak
+include $(PWLIBDIR)/share/pwlib/common.mak
+
 
 
 OH323_OBJDIR = $(OH323_LIBDIR)/$(PT_OBJBASE)
@@ -738,7 +740,7 @@
 
 ####################################################
 
-include $(PWLIBDIR)/make/common.mak
+include $(PWLIBDIR)/share/pwlib/common.mak
 
 ####################################################
 
@@ -751,7 +753,7 @@
 LIB_BASENAME=$(OH323_BASE)
 LIB_FILENAME=$(OH323_FILE)
 
-include $(PWLIBDIR)/make/lib.mak
+include $(PWLIBDIR)/share/pwlib/lib.mak
 
 ####################################################
 
@@ -781,14 +783,14 @@
 # If we're cross compiling, we want the host's asnparser
 # otherwise use the one for the current platform
 ASNPARSE_DIR = $(HOSTPWLIBDIR)/tools/asnparser
-ASNPARSER = $(ASNPARSE_DIR)/obj_$(HOST_PLATFORM_TYPE)_r/asnparser
+ASNPARSER = $(PWLIBDIR)/bin/asnparser
 
 
 # If not cross compiling then make sure asnparser is built
-ifeq ($(PLATFORM_TYPE),$(HOST_PLATFORM_TYPE))
-$(ASNPARSER):
-	$(MAKE) -C $(ASNPARSE_DIR) opt
-endif
+#ifeq ($(PLATFORM_TYPE),$(HOST_PLATFORM_TYPE))
+#$(ASNPARSER):
+#	$(MAKE) -C $(ASNPARSE_DIR) opt
+#endif
 
 
 ifdef ASN_EXCLUDE

--- openh323-1.12.0/openh323u.mak.in.orig	2003-05-14 21:52:44.000000000 +0200
+++ openh323-1.12.0/openh323u.mak.in	2003-06-26 16:16:36.000000000 +0200
@@ -169,7 +169,7 @@
 
 
 
-OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
+OH323_BASE  = openh323
 OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
 
 LDFLAGS	    += -L$(OH323_LIBDIR)

--- pwlib-1.5.0/make/ptlib-config.in.pwlibdir	2003-04-28 03:10:03.000000000 +0200
+++ pwlib-1.5.0/make/ptlib-config.in	2003-07-03 11:55:02.000000000 +0200
@@ -8,7 +8,7 @@
 CCFLAGS="@STDCCFLAGS@"
 LDFLAGS="@LDFLAGS@"
 LIBS="@ENDLDLIBS@"
-PWLIBDIR="@PWLIBDIR@"
+PWLIBDIR="@datadir@/pwlib"
 MACHTYPE="@MACHTYPE@"
 OSTYPE="@OSTYPE@"
 OSRELEASE="@OSRELEASE@"
--- pwlib-1.5.0/make/ptbuildopts.mak.in.pwlibdir	2003-05-22 14:16:24.000000000 +0200
+++ pwlib-1.5.0/make/ptbuildopts.mak.in	2003-07-03 11:57:27.000000000 +0200
@@ -1,7 +1,7 @@
 # This file is automatically generated by autoconf
 #
 
-PWLIBDIR   = @PWLIBDIR@
+PWLIBDIR   = @datadir@/pwlib
 
 MACHTYPE   = @MACHTYPE@
 OSTYPE	   = @OSTYPE@

--- openh323-1.12.0/Makefile.in.orig	2003-07-16 16:00:54.000000000 +0200
+++ openh323-1.12.0/Makefile.in	2003-07-16 16:02:13.000000000 +0200
@@ -273,7 +273,6 @@
 	cp -rf include/* $(PREFIX)/include/openh323/
 	mkdir -p $(PREFIX)/share/openh323/
 	cp openh323u.mak $(PREFIX)/share/openh323
-	ln -s $(PREFIX)/lib/$(OH323_FILE) $(PREFIX)/lib/libopenh323.so
 	chmod -R a+r $(PREFIX)/include/openh323 $(PREFIX)/share/openh323
 
 uninstall:

--- openh323-1.12.0/src/Makefile.orig	2003-06-26 16:17:37.000000000 +0200
+++ openh323-1.12.0/src/Makefile	2003-06-26 16:21:11.000000000 +0200
@@ -1122,58 +1122,58 @@
 
 $(OH323_OBJDIR)/%.o : $(GSM_SRCDIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	$(CC) -ansi -I$(GSM_INCDIR) -fPIC -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
 
 $(DEPDIR)/%.dep : $(GSM_SRCDIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
+	$(CC) -ansi -I$(GSM_INCDIR) -fPIC -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
 
 
 # Build rules for the G.726 codec
 
 $(OH323_OBJDIR)/%.o : $(G726_DIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	$(CC) $(OPTCCFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 $(DEPDIR)/%.dep : $(G726_DIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) $(OPTCCFLAGS) $(CFLAGS) -M $< >> $@
+	$(CC) $(OPTCCFLAGS) $(CFLAGS) -fPIC -M $< >> $@
 
 
 # Build rules for the LPC10 codec
 
 $(OH323_OBJDIR)/%.o : $(LPC10_SRCDIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	$(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 $(DEPDIR)/%.dep : $(LPC10_SRCDIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
+	$(CC) -I$(LPC10_INCDIR) $(CFLAGS) -fPIC -M $< >> $@
 
 # Build rules for the iLBC codec
 
 $(OH323_OBJDIR)/%.o : $(ILBC_DIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	$(CC) $(OPTCCFLAGS) $(CFLAGS) -c -fPIC $< -o $@
 
 $(DEPDIR)/%.dep : $(ILBC_DIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) $(CFLAGS) -M $< >> $@
+	$(CC) $(CFLAGS) -fPIC -M $< >> $@
 
 # Build rules for the Speex codec
 
 $(OH323_OBJDIR)/%.o : $(SPEEX_SRCDIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 $(DEPDIR)/%.dep : $(SPEEX_SRCDIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@
+	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -fPIC -M $< >> $@
 
 
 notrace::

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]