Loading package/libgtk12/gtk+1.2-reconf.patch +0 −46 Original line number Diff line number Diff line Loading @@ -641,49 +641,3 @@ gtk-config use pkg-config AC_DEFUN(AM_GTK_WITH_NLS, [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS --- gtk+-1.2.10/gtk-config.in~gtk+1.2-reconf-fix +++ gtk+-1.2.10/gtk-config.in @@ -1,10 +1,5 @@ #!/bin/sh -glib_libs="@glib_libs@" -glib_cflags="@glib_cflags@" -glib_thread_libs="@glib_thread_libs@" -glib_thread_cflags="@glib_thread_cflags@" - prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no @@ -86,27 +81,16 @@ fi if test "$lib_gthread" = "yes"; then - glib_cflags="$glib_thread_cflags" - glib_libs="$glib_thread_libs" + modules="gtk+ gthread" +else + modules="gtk+" fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@/gtk-1.2 $glib_cflags @x_cflags@ + echo `pkg-config --cflags $modules` fi if test "$echo_libs" = "yes"; then - my_glib_libs= - libdirs=-L@libdir@ - for i in $glib_libs ; do - if test $i != -L@libdir@ ; then - if test -z "$my_glib_libs" ; then - my_glib_libs="$i" - else - my_glib_libs="$my_glib_libs $i" - fi - fi - done - - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm + echo `pkg-config --libs $modules` fi Loading
package/libgtk12/gtk+1.2-reconf.patch +0 −46 Original line number Diff line number Diff line Loading @@ -641,49 +641,3 @@ gtk-config use pkg-config AC_DEFUN(AM_GTK_WITH_NLS, [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS --- gtk+-1.2.10/gtk-config.in~gtk+1.2-reconf-fix +++ gtk+-1.2.10/gtk-config.in @@ -1,10 +1,5 @@ #!/bin/sh -glib_libs="@glib_libs@" -glib_cflags="@glib_cflags@" -glib_thread_libs="@glib_thread_libs@" -glib_thread_cflags="@glib_thread_cflags@" - prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no @@ -86,27 +81,16 @@ fi if test "$lib_gthread" = "yes"; then - glib_cflags="$glib_thread_cflags" - glib_libs="$glib_thread_libs" + modules="gtk+ gthread" +else + modules="gtk+" fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@/gtk-1.2 $glib_cflags @x_cflags@ + echo `pkg-config --cflags $modules` fi if test "$echo_libs" = "yes"; then - my_glib_libs= - libdirs=-L@libdir@ - for i in $glib_libs ; do - if test $i != -L@libdir@ ; then - if test -z "$my_glib_libs" ; then - my_glib_libs="$i" - else - my_glib_libs="$my_glib_libs $i" - fi - fi - done - - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm + echo `pkg-config --libs $modules` fi