diff --git a/ChangeLog b/ChangeLog index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9522faa1c..2fe8f59ba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + +Sat May 23 18:57:06 1998 Owen Taylor + + [ Combination of: + gtk-rrh-980412-0.patch (Raja R Harinath ) + gtk-jbuhler-980516-0 (Jeremy Buhler ) ] + + * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c + gtk/gtksignal.c gtk/gtktext.c: + + Fixups for warnings from adding const to type of GHashFunc, + GCompareFunc + + * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ + ansi-warnings fixups. + Sat May 23 17:48:58 1998 Owen Taylor * gtk/gtkeventbox.c (gtk_event_box_size_allocate): diff --git a/configure.in b/configure.in index be02f4e1f..5311d0008 100644 --- a/configure.in +++ b/configure.in @@ -143,9 +143,17 @@ saved_ldflags="$LDFLAGS" CFLAGS="$X_CFLAGS" LDFLAGS="$X_LDFLAGS $X_LIBS" +if test "x$no_x" = "xyes"; then + AC_MSG_ERROR([ +*** X libraries or include files not found. Check 'config.log' for +*** more details.]) +fi + # Checks for libraries. # Check for the X11 library -AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", no_x11_lib=yes, $X_EXTRA_LIBS) +AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", + AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]), + $X_EXTRA_LIBS) if test "x$enable_shm" = "xyes"; then # Check for the Xext library (needed for XShm extention)