diff options
Diffstat (limited to 'net/gnomemeeting2/files/patch-aa')
| -rw-r--r-- | net/gnomemeeting2/files/patch-aa | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/net/gnomemeeting2/files/patch-aa b/net/gnomemeeting2/files/patch-aa index 830812d69a70..de9ae39cd136 100644 --- a/net/gnomemeeting2/files/patch-aa +++ b/net/gnomemeeting2/files/patch-aa @@ -1,5 +1,5 @@ -*** configure.in.orig Sun Jun 17 22:17:49 2001 ---- configure.in Thu Jul 26 11:36:11 2001 +*** configure.in.orig Thu Aug 16 17:31:42 2001 +--- configure.in Fri Aug 17 16:51:41 2001 *************** AC_ARG_PROGRAM *** 28,38 **** @@ -8,27 +8,27 @@ ! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_linux_x86_r -ldl -lpt_linux_x86_r -lpthread" - LDAP_INCLUDES="-I/usr/local/include" + LDAP_INCLUDES="-I/usr/include -I/usr/local/include" ! LDAP_LIBS="-lldap -llber -lresolv" - - + GNOMEMEETING_INCLUDES="" + GNOMEMEETING_LDADD="" --- 28,38 ---- H323_INCLUDES="-I$PWLIBDIR/include/ptlib/unix -I$PWLIBDIR/include -I$OPENH323DIR/include" -! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread" +! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto -DP_SSL" - LDAP_INCLUDES="-I/usr/local/include" + LDAP_INCLUDES="-I/usr/include -I/usr/local/include" ! LDAP_LIBS="-L/usr/local/lib -lldap -llber" - - + GNOMEMEETING_INCLUDES="" + GNOMEMEETING_LDADD="" *************** dnl ************************************ *** 48,55 **** if test "x${OSTYPE}" = "xlinux-gnu"; then - H323_CFLAGS="-D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -DPTRACING -O2 -DLINUX" + H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2 -DLINUX" else ! H323_CFLAGS="-DP_SOLARIS=8 -D_REENTRANT -D_DEBUG -DPMEMORY_CHECK=1 -DP_THREADS ! -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DSOLARIS" @@ -37,12 +37,29 @@ dnl ********************************************************************* --- 48,54 ---- if test "x${OSTYPE}" = "xlinux-gnu"; then - H323_CFLAGS="-D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -DPTRACING -O2 -DLINUX" + H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2 -DLINUX" else ! H323_CFLAGS="-DP_FREEBSD=400001 -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DNDEBUG" fi dnl ********************************************************************* +*************** dnl ************************************ +*** 58,64 **** + + + GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS" +! GNOMEMEETING_LDADD="`gtk-config --libs gthread` $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS" + + + GNOME_COMPILE_WARNINGS +--- 57,63 ---- + + + GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS" +! GNOMEMEETING_LDADD="`gtk12-config --libs gthread` $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS" + + + GNOME_COMPILE_WARNINGS *************** AM_PROG_LIBTOOL *** 69,77 **** dnl ######################################################################### |