Check for newer popt, and include it in the needed libs. Give correct

* configure.in: Check for newer popt, and include it in the needed libs.
* gnome-compat-1.0.h: Give correct paths to compat headers.
* gnome-config.in: Fixes to make help output correct.
* gnome.m4: Reorg so it doesn't do any path searching itself, just uses gnome-config.
* libgnome/gnome-popt.h: Include popt.h not popt-gnome.h
* support/Makefile.am: No popt built-in.

svn path=/trunk/; revision=1119

diff --git a/hack-macros/gnome.m4 b/hack-macros/gnome.m4
index d398161..0891aae 100644 (file)
--- a/hack-macros/gnome.m4
+++ b/hack-macros/gnome.m4
@@ -429,11 +429,7 @@ AC_ARG_ENABLE(gnometest, [  --disable-gnometest       Do not try to compile and
   fi
   for module in $4 ""; do
        gnome_m4_notfound=no
-       if test -f $tmp_gnome_libdir/${module}Conf.sh; then
-               tmp_bsnom=`echo $module | tr a-z A-Z`
-               eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\"
-               eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\"
-       elif test "$module" = zvt; then
+       if test "$module" = zvt; then
          ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`"
          AC_SUBST(ZVT_LIBS)
        elif test "$module" = gtk; then
@@ -457,10 +453,15 @@ AC_ARG_ENABLE(gnometest, [  --disable-gnometest       Do not try to compile and
          AC_SUBST(GNORBA_CFLAGS)
          AC_SUBST(GNORBA_LIBS)
        elif test -n "$module"; then
+         if $GNOME_CONFIG $gnome_config_args --cflags $module 2>/dev/null; then
+               tmp_bsnom=`echo $module | tr a-z A-Z`
+               eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\"
+               eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\"
+         else
+               AC_MSG_RESULT([*** $module library is not installed])
+               ifelse([$3], , :, [$3])
+               gnome_m4_notfound=yes
          echo
-         AC_MSG_RESULT([*** $module library is not installed])
-         ifelse([$3], , :, [$3])
-         gnome_m4_notfound=yes
        fi
        if test "$gnome_m4_notfound" = no; then
          echo $ac_n " $module" 1>&6

diff --git a/support/Makefile.am b/support/Makefile.am
index e9ec48d..6b4e715 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -12,13 +12,14 @@ supportexecinclude_DATA = gnomesupport.h
 
 # These are internal headers: they are used only when compiling and
 # should not be installed
-noinst_HEADERS = gnomesupport-fake.h \
-                findme.h poptint.h system.h
+#noinst_HEADERS = gnomesupport-fake.h \
+#               findme.h poptint.h system.h
 
 # Hmm... should we move `error.h' here.
-include_HEADERS = popt-gnome.h
+#include_HEADERS = popt-gnome.h
 
-popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
+#popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
+popt_sources=
 
 libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
 libgnomesupport_la_LIBADD  = @LTLIBOBJS@