ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/aclocal.m4
(Generate patch)

Comparing BasiliskII/src/Unix/aclocal.m4 (file contents):
Revision 1.2 by cebix, 1999-10-23T17:57:44Z vs.
Revision 1.6 by cebix, 2000-11-02T14:45:15Z

# Line 1 | Line 1
1 + dnl aclocal.m4 generated automatically by aclocal 1.4
2 +
3 + dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
4 + dnl This file is free software; the Free Software Foundation
5 + dnl gives unlimited permission to copy and/or distribute it,
6 + dnl with or without modifications, as long as this notice is preserved.
7 +
8 + dnl This program is distributed in the hope that it will be useful,
9 + dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
10 + dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11 + dnl PARTICULAR PURPOSE.
12 +
13   # Configure paths for GTK+
14   # Owen Taylor     97-11-3
15  
16 < dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
16 > dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
17   dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
18   dnl
19   AC_DEFUN(AM_PATH_GTK,
# Line 15 | Line 27 | AC_ARG_WITH(gtk-exec-prefix,[  --with-gt
27   AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
28                      , enable_gtktest=yes)
29  
30 +  for module in . $4
31 +  do
32 +      case "$module" in
33 +         gthread)
34 +             gtk_config_args="$gtk_config_args gthread"
35 +         ;;
36 +      esac
37 +  done
38 +
39    if test x$gtk_config_exec_prefix != x ; then
40       gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
41       if test x${GTK_CONFIG+set} != xset ; then
# Line 47 | Line 68 | AC_ARG_ENABLE(gtktest, [  --disable-gtkt
68        ac_save_CFLAGS="$CFLAGS"
69        ac_save_LIBS="$LIBS"
70        CFLAGS="$CFLAGS $GTK_CFLAGS"
71 <      LIBS="$LIBS $GTK_LIBS"
71 >      LIBS="$GTK_LIBS $LIBS"
72   dnl
73   dnl Now check if the installed GTK is sufficiently new. (Also sanity
74   dnl checks the results of gtk-config to some extent
# Line 56 | Line 77 | dnl
77        AC_TRY_RUN([
78   #include <gtk/gtk.h>
79   #include <stdio.h>
80 + #include <stdlib.h>
81  
82   int
83   main ()
84   {
85    int major, minor, micro;
86 +  char *tmp_version;
87  
88    system ("touch conf.gtktest");
89  
90 <  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
90 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
91 >  tmp_version = g_strdup("$min_gtk_version");
92 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
93       printf("%s, bad version string\n", "$min_gtk_version");
94       exit(1);
95     }
# Line 85 | Line 110 | main ()
110        printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
111        printf("*** before re-running configure\n");
112      }
113 + #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
114 +  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
115 +           (gtk_minor_version != GTK_MINOR_VERSION) ||
116 +           (gtk_micro_version != GTK_MICRO_VERSION))
117 +    {
118 +      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
119 +             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
120 +      printf("*** library (version %d.%d.%d)\n",
121 +             gtk_major_version, gtk_minor_version, gtk_micro_version);
122 +    }
123 + #endif /* defined (GTK_MAJOR_VERSION) ... */
124    else
125      {
126        if ((gtk_major_version > major) ||
# Line 169 | Line 205 | main ()
205    rm -f conf.gtktest
206   ])
207  
172
208   # Configure paths for ESD
209   # Manish Singh    98-9-30
210   # stolen back from Frank Belew
# Line 210 | Line 245 | AC_ARG_ENABLE(esdtest, [  --disable-esdt
245    if test "$ESD_CONFIG" = "no" ; then
246      no_esd=yes
247    else
248 +    AC_LANG_SAVE
249 +    AC_LANG_C
250      ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
251      ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
252  
# Line 286 | Line 323 | int main ()
323   ],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
324         CFLAGS="$ac_save_CFLAGS"
325         LIBS="$ac_save_LIBS"
326 +       AC_LANG_RESTORE
327       fi
328    fi
329    if test "x$no_esd" = x ; then
# Line 305 | Line 343 | int main ()
343            echo "*** Could not run ESD test program, checking why..."
344            CFLAGS="$CFLAGS $ESD_CFLAGS"
345            LIBS="$LIBS $ESD_LIBS"
346 +          AC_LANG_SAVE
347 +          AC_LANG_C
348            AC_TRY_LINK([
349   #include <stdio.h>
350   #include <esd.h>
# Line 324 | Line 364 | int main ()
364            echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
365            CFLAGS="$ac_save_CFLAGS"
366            LIBS="$ac_save_LIBS"
367 +          AC_LANG_RESTORE
368         fi
369       fi
370       ESD_CFLAGS=""
# Line 334 | Line 375 | int main ()
375    AC_SUBST(ESD_LIBS)
376    rm -f conf.esdtest
377   ])
378 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines