GNOME.org
 

PATCH: gnome-libs on AIX

Hi, attached is the patches included with the official IBM AIX gnome lib
package. 

(From http://www-1.ibm.com/servers/aix/products/aixos/linux/index.html)

Since I don't think these patches have been submited I am mailing them
to the respective lists. P.S. I don't work for IBM nor do I use AIX very
often.

Christian

Index: gnome1.2/gnome-libs-1.2.0/ltconfig
diff -c gnome1.2/gnome-libs-1.2.0/ltconfig:1.1 gnome1.2/gnome-libs-1.2.0/ltconfig:1.2
*** gnome1.2/gnome-libs-1.2.0/ltconfig:1.1	Mon Jun 12 16:54:47 2000
--- gnome1.2/gnome-libs-1.2.0/ltconfig	Thu Aug 24 14:15:39 2000
***************
*** 696,702 ****
  else
    # PORTME Check for PIC flags for the system compiler.
    case "$host_os" in
!   aix3* | aix4*)
      # All AIX code is PIC.
      link_static_flag='-bnso -bI:/lib/syscalls.exp'
      ;;
--- 696,702 ----
  else
    # PORTME Check for PIC flags for the system compiler.
    case "$host_os" in
!   aix3* | aix4* | aix5*)
      # All AIX code is PIC.
      link_static_flag='-bnso -bI:/lib/syscalls.exp'
      ;;
***************
*** 1115,1121 ****
  
    # See if GNU ld supports shared libraries.
    case "$host_os" in
!   aix3* | aix4*)
      # On AIX, the GNU linker is very broken
      ld_shlibs=no
      cat <<EOF 1>&2
--- 1115,1121 ----
  
    # See if GNU ld supports shared libraries.
    case "$host_os" in
!   aix3* | aix4* | aix5*)
      # On AIX, the GNU linker is very broken
      ld_shlibs=no
      cat <<EOF 1>&2
***************
*** 1270,1308 ****
      fi
      ;;
  
!   aix4*)
!     hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
!     hardcode_libdir_separator=':'
!     if test "$with_gcc" = yes; then
!       collect2name=`${CC} -print-prog-name=collect2`
!       if test -f "$collect2name" && \
! 	 strings "$collect2name" | grep resolve_lib_name >/dev/null
!       then
! 	# We have reworked collect2
! 	hardcode_direct=yes
        else
! 	# We have old collect2
! 	hardcode_direct=unsupported
! 	# It fails to find uninstalled libraries when the uninstalled
! 	# path is not listed in the libpath.  Setting hardcode_minus_L
! 	# to unsupported forces relinking
! 	hardcode_minus_L=yes
! 	hardcode_libdir_flag_spec='-L$libdir'
! 	hardcode_libdir_separator=
        fi
!       shared_flag='-shared'
      else
!       shared_flag='${wl}-bM:SRE'
!       hardcode_direct=yes
      fi
!     allow_undefined_flag=' ${wl}-berok'
!     archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
!     archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!     case "$host_os" in aix4.[01]|aix4.[01].*)
!       # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
!       always_export_symbols=yes ;;
!     esac
!    ;;
  
    amigaos*)
      archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
--- 1270,1352 ----
      fi
      ;;
  
!   aix4* | aix5*)
!     # First test if we are trying to use run time linking, or normal AIX style linking.
!     # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
!     aix_use_runtimelinking=no
!     for ld_flag in $LDFLAGS; do
!       if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
!         aix_use_runtimelinking=yes
!         break
!       fi
!     done
!     if test "$aix_use_runtimelinking" = yes; then
!       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
!       hardcode_libdir_separator=':'
!       if test "$with_gcc" = yes; then
!         collect2name=`${CC} -print-prog-name=collect2`
!         if test -f "$collect2name" && \
! 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
!         then
! 	  # We have reworked collect2
! 	  hardcode_direct=yes
!         else
! 	  # We have old collect2
! 	  hardcode_direct=unsupported
! 	  # It fails to find uninstalled libraries when the uninstalled
! 	  # path is not listed in the libpath.  Setting hardcode_minus_L
! 	  # to unsupported forces relinking
! 	  hardcode_minus_L=yes
! 	  hardcode_libdir_flag_spec='-L$libdir'
! 	  hardcode_libdir_separator=
!         fi
!         shared_flag='-shared'
        else
!         shared_flag='${wl}-bM:SRE'
!         hardcode_direct=yes
        fi
!       allow_undefined_flag=' -Wl,-G'
!       archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bnoentry${allow_undefined_flag}'
!       # It seems that -bexpall can do strange things, so it is better to
!       # generate a list of symbols to export.
!       always_export_symbols=yes
!       archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
      else
!       hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
!       hardcode_libdir_separator=':'
!       if test "$with_gcc" = yes; then
!         collect2name=`${CC} -print-prog-name=collect2`
!         if test -f "$collect2name" && \
!            strings "$collect2name" | grep resolve_lib_name >/dev/null
!         then
!           # We have reworked collect2
!           hardcode_direct=yes
!         else
!           # We have old collect2
!           hardcode_direct=unsupported
!           # It fails to find uninstalled libraries when the uninstalled
!           # path is not listed in the libpath.  Setting hardcode_minus_L
!           # to unsupported forces relinking
!           hardcode_minus_L=yes
!           hardcode_libdir_flag_spec='-L$libdir'
!           hardcode_libdir_separator=
!         fi
!         shared_flag='-shared'
!       else
!         shared_flag='${wl}-bM:SRE'
!         hardcode_direct=yes
!       fi
!       # Warning - without using the other run time loading flags, -berok will
!       #           link without error, but may produce a broken library.
!       allow_undefined_flag=" ${wl}-berok"
!       archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
!       archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!       case "$host_os" in aix4.[01]|aix4.[01].*)
!         # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
!         always_export_symbols=yes ;;
!       esac
      fi
!     ;;
  
    amigaos*)
      archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
***************
*** 1800,1813 ****
    soname_spec='${libname}${release}.so$major'
    ;;
  
! aix4*)
    version_type=linux
    # AIX has no versioning support, so currently we can not hardcode correct
    # soname into executable. Probably we can add versioning support to
    # collect2, so additional links can be useful in future.
!   # We preserve .a as extension for shared libraries though AIX4.2
!   # and later linker supports .so
!   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
    shlibpath_var=LIBPATH
    deplibs_check_method=pass_all
    ;;
--- 1844,1863 ----
    soname_spec='${libname}${release}.so$major'
    ;;
  
! aix4* | aix5*)
    version_type=linux
    # AIX has no versioning support, so currently we can not hardcode correct
    # soname into executable. Probably we can add versioning support to
    # collect2, so additional links can be useful in future.
!   if test "$aix_use_runtimelinking" = yes; then
!     # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
!     # lib<name>.a to let people know that these are not typical AIX shared libraries.
!     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
!   else
!     # We preserve .a as extension for shared libraries though AIX4.2
!     # and later linker supports .so
!     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
!   fi
    shlibpath_var=LIBPATH
    deplibs_check_method=pass_all
    ;;
Index: gnome1.2/gnome-libs-1.2.0/libart_lgpl/art_misc.h
diff -c gnome1.2/gnome-libs-1.2.0/libart_lgpl/art_misc.h:1.1 gnome1.2/gnome-libs-1.2.0/libart_lgpl/art_misc.h:1.2
*** gnome1.2/gnome-libs-1.2.0/libart_lgpl/art_misc.h:1.1	Mon Jun 12 16:54:50 2000
--- gnome1.2/gnome-libs-1.2.0/libart_lgpl/art_misc.h	Thu Aug 24 14:17:40 2000
***************
*** 43,48 ****
--- 43,49 ----
  #define ART_FALSE 0
  #define ART_TRUE 1
  
+ #include <math.h>
  /* define pi */
  #ifndef M_PI
  #define M_PI 3.14159265358979323846
Index: gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.am
diff -c gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.am:1.1 gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.am:1.2
*** gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.am:1.1	Mon Jun 12 16:54:50 2000
--- gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.am	Thu Aug 24 14:19:13 2000
***************
*** 81,87 ****
  gnome-config.o: parse-path.cP
  
  libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
! libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
  
  bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
  	gconfigger gnome-gen-mimedb
--- 81,87 ----
  gnome-config.o: parse-path.cP
  
  libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
! libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) $(INTLLIBS)
  
  bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
  	gconfigger gnome-gen-mimedb
Index: gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.in
diff -c gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.in:1.1 gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.in:1.2
*** gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.in:1.1	Mon Jun 12 16:54:50 2000
--- gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.in	Thu Aug 24 14:20:33 2000
***************
*** 169,175 ****
  EXTRA_DIST = parse-path.cP 
  
  libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
! libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
  
  bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
  
--- 169,175 ----
  EXTRA_DIST = parse-path.cP 
  
  libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
! libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) $(INTLLIBS)
  
  bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
  
Index: gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.am
diff -c gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.am:1.1 gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.am:1.2
*** gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.am:1.1	Mon Jun 12 16:54:51 2000
--- gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.am	Thu Aug 24 14:24:17 2000
***************
*** 263,269 ****
  	gnometypebuiltins_evals.c
  
  libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir)
! libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
  
  gnome_segv_LDADD =	\
  	libgnomeui.la 					\
--- 263,269 ----
  	gnometypebuiltins_evals.c
  
  libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir)
! libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS)
  
  gnome_segv_LDADD =	\
  	libgnomeui.la 					\
Index: gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.in
diff -c gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.in:1.1 gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.in:1.2
*** gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.in:1.1	Mon Jun 12 16:54:51 2000
--- gnome1.2/gnome-libs-1.2.0/libgnomeui/Makefile.in	Thu Aug 24 14:25:24 2000
***************
*** 200,206 ****
  
  
  libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir)
! libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
  
  gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
  
--- 200,206 ----
  
  
  libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir)
! libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS)
  
  gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
  
Index: gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-app.h
diff -c gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-app.h:1.1 gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-app.h:1.2
*** gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-app.h:1.1	Mon Jun 12 16:54:52 2000
--- gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-app.h	Thu Aug 24 14:26:32 2000
***************
*** 29,37 ****
  
  #define GNOME_TYPE_APP            (gnome_app_get_type ())
  #define GNOME_APP(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_APP, GnomeApp))
! //#define GNOME_APP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APP, GnomeAppClass))
  #define GNOME_IS_APP(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_APP))
! //#define GNOME_IS_APP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APP))
  
  
  typedef struct _GnomeApp       GnomeApp;
--- 29,37 ----
  
  #define GNOME_TYPE_APP            (gnome_app_get_type ())
  #define GNOME_APP(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_APP, GnomeApp))
! /* //#define GNOME_APP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APP, GnomeAppClass)) */
  #define GNOME_IS_APP(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_APP))
! /* //#define GNOME_IS_APP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APP)) */
  
  
  typedef struct _GnomeApp       GnomeApp;
Index: gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-window-icon.c
diff -c gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-window-icon.c:1.1 gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-window-icon.c:1.2
*** gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-window-icon.c:1.1	Mon Jun 12 16:54:52 2000
--- gnome1.2/gnome-libs-1.2.0/libgnomeui/gnome-window-icon.c	Thu Aug 24 14:27:49 2000
***************
*** 9,14 ****
--- 9,18 ----
  
  #include "config.h"
  
+ #ifdef _AIX
+ #include <stdlib.h>
+ #endif
+ 
  #include <gtk/gtk.h>
  #include <gdk/gdkx.h>
  
Index: gnome1.2/gnome-libs-1.2.0/support/Makefile.am
diff -c gnome1.2/gnome-libs-1.2.0/support/Makefile.am:1.1 gnome1.2/gnome-libs-1.2.0/support/Makefile.am:1.2
*** gnome1.2/gnome-libs-1.2.0/support/Makefile.am:1.1	Mon Jun 12 16:54:48 2000
--- gnome1.2/gnome-libs-1.2.0/support/Makefile.am	Thu Aug 24 14:37:04 2000
***************
*** 21,27 ****
  popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
! libgnomesupport_la_LIBADD  = @LTLIBOBJS@
  libgnomesupport_la_LDFLAGS = -version-info 0:0:0
  
  BUILT_SOURCES = gnomesupport.h
--- 21,27 ----
  popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
! libgnomesupport_la_LIBADD  = @LTLIBOBJS@ $(INTLLIBS)
  libgnomesupport_la_LDFLAGS = -version-info 0:0:0
  
  BUILT_SOURCES = gnomesupport.h
Index: gnome1.2/gnome-libs-1.2.0/support/Makefile.in
diff -c gnome1.2/gnome-libs-1.2.0/support/Makefile.in:1.1 gnome1.2/gnome-libs-1.2.0/support/Makefile.in:1.2
*** gnome1.2/gnome-libs-1.2.0/support/Makefile.in:1.1	Mon Jun 12 16:54:48 2000
--- gnome1.2/gnome-libs-1.2.0/support/Makefile.in	Thu Aug 24 14:37:50 2000
***************
*** 165,171 ****
  popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
! libgnomesupport_la_LIBADD = @LTLIBOBJS@
  libgnomesupport_la_LDFLAGS = -version-info 0:0:0
  
  BUILT_SOURCES = gnomesupport.h
--- 165,171 ----
  popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
  
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
! libgnomesupport_la_LIBADD = @LTLIBOBJS@ $(INTLLIBS)
  libgnomesupport_la_LDFLAGS = -version-info 0:0:0
  
  BUILT_SOURCES = gnomesupport.h
Index: gnome1.2/gnome-libs-1.2.0/zvt/subshell-includes.h
diff -c gnome1.2/gnome-libs-1.2.0/zvt/subshell-includes.h:1.1 gnome1.2/gnome-libs-1.2.0/zvt/subshell-includes.h:1.2
*** gnome1.2/gnome-libs-1.2.0/zvt/subshell-includes.h:1.1	Mon Jun 12 16:54:57 2000
--- gnome1.2/gnome-libs-1.2.0/zvt/subshell-includes.h	Thu Aug 24 16:18:26 2000
***************
*** 3,9 ****
--- 3,11 ----
  
  #include <stdio.h>      
  #include <fcntl.h>	/* for close-on-exec stuff	      */
+ #ifndef _XOPEN_SOURCE
  #define _XOPEN_SOURCE 1
+ #endif
  #define __EXTENSIONS__ 1	/* needed for winsize struct
  				   on Solaris (?) */
  
Index: gnome1.2/gnome-libs-1.2.0/zvt/vtx.h
diff -c gnome1.2/gnome-libs-1.2.0/zvt/vtx.h:1.1 gnome1.2/gnome-libs-1.2.0/zvt/vtx.h:1.2
*** gnome1.2/gnome-libs-1.2.0/zvt/vtx.h:1.1	Mon Jun 12 16:54:57 2000
--- gnome1.2/gnome-libs-1.2.0/zvt/vtx.h	Thu Aug 24 16:19:34 2000
***************
*** 27,32 ****
--- 27,35 ----
  /* DO NOT include the toolkit */
  /*#include <gtk/gtk.h> */
  
+ #ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 1
+ #endif
  #include <regex.h>
  
  #ifdef __cplusplus
Index: gnome1.2/gnome-libs-1.2.0/zvt/zvtterm.h
diff -c gnome1.2/gnome-libs-1.2.0/zvt/zvtterm.h:1.1 gnome1.2/gnome-libs-1.2.0/zvt/zvtterm.h:1.2
*** gnome1.2/gnome-libs-1.2.0/zvt/zvtterm.h:1.1	Mon Jun 12 16:54:57 2000
--- gnome1.2/gnome-libs-1.2.0/zvt/zvtterm.h	Thu Aug 24 16:20:49 2000
***************
*** 139,145 ****
  typedef enum {
    ZVT_FONT_1BYTE=0,		/* simple, 1-byte fonts */
    ZVT_FONT_2BYTE,		/* 2-byte fonts */
!   ZVT_FONT_FONTSET,		/* fontset fonts */
  } zvtfont_t;
  
  /* private data structure, stored under "_zvtprivate" */
--- 139,145 ----
  typedef enum {
    ZVT_FONT_1BYTE=0,		/* simple, 1-byte fonts */
    ZVT_FONT_2BYTE,		/* 2-byte fonts */
!   ZVT_FONT_FONTSET 		/* fontset fonts */
  } zvtfont_t;
  
  /* private data structure, stored under "_zvtprivate" */

--- gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.in	Thu Aug 24 14:20:33 2000
+++ gnome1.2.db/gnome-libs-1.2.0/libgnome/Makefile.in	Tue Sep 26 09:56:45 2000
@@ -76,6 +76,7 @@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
+DB_LIB = @DB_LIB@
 DLLTOOL = @DLLTOOL@
 DL_LIB = @DL_LIB@
 ESD_CFLAGS = @ESD_CFLAGS@
@@ -169,7 +170,7 @@
 EXTRA_DIST = parse-path.cP 
 
 libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
-libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) $(INTLLIBS)
+libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) $(INTLLIBS) $(DB_LIB)
 
 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
 
--- gnome1.2/gnome-libs-1.2.0/libgnome/Makefile.am	Thu Aug 24 14:19:13 2000
+++ gnome1.2.db/gnome-libs-1.2.0/libgnome/Makefile.am	Tue Sep 26 09:56:19 2000
@@ -81,7 +81,7 @@
 gnome-config.o: parse-path.cP
 
 libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
-libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) $(INTLLIBS)
+libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) $(INTLLIBS) $(DB_LIB)
 
 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
 	gconfigger gnome-gen-mimedb
--- gnome1.2/gnome-libs-1.2.0/Makefile.in	Mon Jun 12 16:54:47 2000
+++ gnome1.2.db/gnome-libs-1.2.0/Makefile.in	Tue Sep 26 09:55:45 2000
@@ -75,6 +75,7 @@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
+DB_LIB = @DB_LIB@
 DLLTOOL = @DLLTOOL@
 DL_LIB = @DL_LIB@
 ESD_CFLAGS = @ESD_CFLAGS@
--- gnome1.2/gnome-libs-1.2.0/configure.in	Mon Jun 12 16:54:47 2000
+++ gnome1.2.db/gnome-libs-1.2.0/configure.in	Tue Sep 26 09:52:55 2000
@@ -289,6 +289,7 @@
   )
  )
 fi
+AC_SUBST(DB_LIB)
 )
 
 dnl look for db headers
--- gnome1.2/gnome-libs-1.2.0/configure	Thu Aug 24 14:14:47 2000
+++ gnome1.2.db/gnome-libs-1.2.0/configure	Tue Sep 26 09:54:38 2000
@@ -10661,6 +10661,7 @@
 s% MKINSTALLDIRS@%$MKINSTALLDIRS%g
 s% l@%$l%g
 s% gnomelocaledir@%$gnomelocaledir%g
+s% DB_LIB@%$DB_LIB%g
 s% DL_LIB@%$DL_LIB%g
 s% NSL_LIBS@%$NSL_LIBS%g
 s% UTIL_LIBS@%$UTIL_LIBS%g

Index: gnome1.2/gnome-libs-1.2.0/libart_lgpl/Makefile.in
diff -c gnome1.2/gnome-libs-1.2.0/libart_lgpl/Makefile.in:1.1.1.1 gnome1.2/gnome-libs-1.2.0/libart_lgpl/Makefile.in:1.2
*** gnome1.2/gnome-libs-1.2.0/libart_lgpl/Makefile.in:1.1.1.1	Mon Jun 12 16:54:49 2000
--- gnome1.2/gnome-libs-1.2.0/libart_lgpl/Makefile.in	Thu Sep 21 16:55:35 2000
***************
*** 130,136 ****
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
! libart_lgpl_la_LIBADD = 
  libart_lgpl_la_OBJECTS =  art_affine.lo art_alphagamma.lo art_bpath.lo \
  art_gray_svp.lo art_misc.lo art_pixbuf.lo art_rect.lo art_rect_svp.lo \
  art_rect_uta.lo art_rgb.lo art_rgb_affine.lo art_rgb_affine_private.lo \
--- 130,136 ----
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
! libart_lgpl_la_LIBADD = -lm
  libart_lgpl_la_OBJECTS =  art_affine.lo art_alphagamma.lo art_bpath.lo \
  art_gray_svp.lo art_misc.lo art_pixbuf.lo art_rect.lo art_rect_svp.lo \
  art_rect_uta.lo art_rgb.lo art_rgb_affine.lo art_rgb_affine_private.lo \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]