gimptool-1.4.in plug-ins/*/Makefile.am merged fixes from stable branch

2001-07-02  Sven Neumann  <sven@gimp.org>

	* gimptool-1.4.in
	* plug-ins/*/Makefile.am
	* plug-ins/common/mkgen.pl: merged fixes from stable branch

ChangeLog

+2001-07-02  Sven Neumann  <sven@gimp.org>
+
+	* gimptool-1.4.in
+	* plug-ins/*/Makefile.am
+	* plug-ins/common/mkgen.pl: merged fixes from stable branch
+	
 2001-07-02  Michael Natterer  <mitch@gimp.org>
 
 	* app/gui/dialogs-commands.[ch]

gimptool-1.4.in

@@ -97,6 +97,14 @@ else
   gtk_libs=`$GTK_CONFIG --libs`
 fi
 
+if test x${GLIB_CONFIG+set} != xset ; then
+  glib_cflags='@GLIB_CFLAGS@'
+  glib_libs='@GLIB_LIBS@'
+else
+  glib_cflags=`$GLIB_CONFIG --cflags`
+  glib_libs=`$GLIB_CONFIG --libs`
+fi
+
 if test x${INSTALL+set} != xset ; then
   INSTALL='@INSTALL@'
   if test "$INSTALL" = "./install-sh -c"; then
@@ -177,7 +185,7 @@ while test $# -gt 0; do
         --cflags | --cflags-nogimpui)
           my_gtk_cflags=$gtk_cflags ;;
         --cflags-noui)
-          my_gtk_cflags=`echo $gtk_cflags | sed 's/^.*\(-I[^ ]*glib[^ ]*  *-I[^ ]*\).*$/\1/'` ;;
+          my_gtk_cflags=$glib_cflags ;;
       esac
       includes=-I@includedir@/gimp-@LT_RELEASE@
       echo $includes $my_gtk_cflags
@@ -202,23 +210,7 @@ while test $# -gt 0; do
       esac
       ;;
     --libs-noui)
-      glib_ldflags=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
-      if test -z "$glib_ldflags" ; then
-        glib_ldflags=`echo $gtk_libs | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`
-      fi 
-      glib_libs="$glib_ldflags `echo $gtk_libs | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`"
-      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 -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_glib_libs
+      echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs
       ;;
     --install-bin | --install-admin-bin \
     | --install-bin-strip | --install-admin-bin-strip \

plug-ins/FractalExplorer/Makefile.am

@@ -24,6 +24,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/Lighting/Makefile.am

@@ -35,6 +35,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	-I$(top_srcdir)/plug-ins/libgck	\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\

plug-ins/MapObject/Makefile.am

@@ -37,6 +37,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	-I$(top_srcdir)/plug-ins/libgck	\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\

plug-ins/bmp/Makefile.am

@@ -17,6 +17,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/common/Makefile.am

@@ -15,6 +15,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)		\
+	-I$(top_srcdir)/intl  	\
 	$(GTK_CFLAGS)		\
 	-I$(includedir)		\
 @STRIP_END@

plug-ins/common/mkgen.pl

@@ -53,6 +53,7 @@ AM_CPPFLAGS = \@STRIP_BEGIN\@ \\
 
 INCLUDES = \@STRIP_BEGIN\@ \\
 	-I\$(top_srcdir)		\\
+	-I\$(top_srcdir)/intl  	\\
 	\$(GTK_CFLAGS)		\\
 	-I\$(includedir)		\\
 \@STRIP_END\@

plug-ins/dbbrowser/Makefile.am

@@ -18,6 +18,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/faxg3/Makefile.am

@@ -17,6 +17,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GLIB_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/fits/Makefile.am

@@ -16,6 +16,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/flame/Makefile.am

@@ -21,6 +21,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/fp/Makefile.am

@@ -18,6 +18,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@

plug-ins/gap/Makefile.am

@@ -212,6 +212,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
 
 INCLUDES = @STRIP_BEGIN@ \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)			\
 @STRIP_END@