[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-171-g02fa8f6)
The branch, master has been updated
via 02fa8f658d315796df7c6ab8790e5310e8548d37 (commit)
from 1645fda42758a837c7ccf1efd32fd3b484e22421 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/configure.ac.in | 70 +----------------------------------------------
gschem/m4/.gitignore | 4 ---
gschem/m4/ChangeLog | 62 -----------------------------------------
libgeda/configure.ac.in | 17 -----------
4 files changed, 1 insertions(+), 152 deletions(-)
delete mode 100644 gschem/m4/.gitignore
delete mode 100644 gschem/m4/ChangeLog
=================
Commit Messages
=================
commit 02fa8f658d315796df7c6ab8790e5310e8548d37
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Jan 10 22:29:21 2009 +0000
Remove explicit checks for X11 - we're not using X11 APIs directly
:100644 100644 c7a2051... f345147... M gschem/configure.ac.in
:100644 000000 28cb5f7... 0000000... D gschem/m4/.gitignore
:100644 000000 53f5c8e... 0000000... D gschem/m4/ChangeLog
:100644 100644 e46f999... 4ae3413... M libgeda/configure.ac.in
=========
Changes
=========
commit 02fa8f658d315796df7c6ab8790e5310e8548d37
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Jan 10 22:29:21 2009 +0000
Remove explicit checks for X11 - we're not using X11 APIs directly
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index c7a2051..f345147 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -188,74 +188,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
############################################################################
############################################################################
-# Check for X11 start
-#
-
-if test "$MINGW" = "no"
-then
- AC_PATH_X
- AC_PATH_XTRA
-
- X_EXTRA_LIBS="$X_EXTRA_LIBS"
- X_LDFLAGS="$X_LDFLAGS $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lX11 -lm"
-
- _use_rpath=no
- AC_MSG_CHECKING([if hardcoding of the X11 runtime library path is desired])
- AC_ARG_ENABLE([rpath],
- [ --enable-rpath Enable hardcoding the X11 runtime library path [default=disabled]],
- [
- if test "X$enable_rpath" = "Xno" ; then
- AC_MSG_RESULT([no])
- _use_rpath=no
- else
- AC_MSG_RESULT([yes])
- _use_rpath=yes
- fi
- ],
- [
- AC_MSG_RESULT([no])
- _use_rpath=no
- ])
-
- if test "X$_use_rpath" = "Xyes" ; then
- # Try to figure out if we need -Rpath for finding X11 libs
- # at runtime. Why autoconf doesn't already do this, I don't
- # know...
- xlib_path=""
- for p in $X_LDFLAGS ; do
- case $p in
- -L*)
- xlib_path="$xlib_path $p"
- ;;
- esac
- done
-
- _save_LIBS=$LIBS
- LIBS="$LIBS $X_LDFLAGS"
- rpath=""
- for fl in "-Wl,-rpath " "-Wl,--rpath " "-rpath " "--rpath " "-Wl,-R" "-R" "-R " ; do
- xlib_rpath=`echo $xlib_path | sed "s/-L/$fl/g"`
- LIBS="$_save_LIBS $X_LIBS $xlib_rpath"
- AC_MSG_CHECKING([if the compiler accepts ${fl}path for runtime libraries])
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
- AC_MSG_RESULT([yes])
- rpath=$fl,
- AC_MSG_RESULT([no]))
- test -n "$rpath" && break
- done
- if test -n "$rpath"; then
- X_LDFLAGS="$X_LDFLAGS $xlib_rpath"
- fi
- LIBS=$_save_LIBS
- fi
-
-fi
-
-#
-# Check for X11 end
-############################################################################
-
-############################################################################
# Check for gtk+ start
#
@@ -603,7 +535,7 @@ AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
GSCHEM_CFLAGS="$MINGW_CFLAGS $LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS"
-GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GTK_LIBS $X_LDFLAGS $DMALLOC_LIBS $GTHREAD_LIBS"
+GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GTK_LIBS $DMALLOC_LIBS $GTHREAD_LIBS"
# Makefile.in variable substitution
AC_SUBST(DATE_VERSION)
diff --git a/gschem/m4/.gitignore b/gschem/m4/.gitignore
deleted file mode 100644
index 28cb5f7..0000000
--- a/gschem/m4/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.m4
-*~
diff --git a/gschem/m4/ChangeLog b/gschem/m4/ChangeLog
deleted file mode 100644
index 53f5c8e..0000000
--- a/gschem/m4/ChangeLog
+++ /dev/null
@@ -1,62 +0,0 @@
-2006-12-02 gettextize <bug-gnu-gettext@xxxxxxx>
-
- * codeset.m4: New file, from gettext-0.15.
- * gettext.m4: New file, from gettext-0.15.
- * glibc2.m4: New file, from gettext-0.15.
- * glibc21.m4: New file, from gettext-0.15.
- * iconv.m4: New file, from gettext-0.15.
- * intdiv0.m4: New file, from gettext-0.15.
- * intmax.m4: New file, from gettext-0.15.
- * inttypes_h.m4: New file, from gettext-0.15.
- * inttypes-h.m4: New file, from gettext-0.15.
- * inttypes-pri.m4: New file, from gettext-0.15.
- * lcmessage.m4: New file, from gettext-0.15.
- * lib-ld.m4: New file, from gettext-0.15.
- * lib-link.m4: New file, from gettext-0.15.
- * lib-prefix.m4: New file, from gettext-0.15.
- * lock.m4: New file, from gettext-0.15.
- * longdouble.m4: New file, from gettext-0.15.
- * longlong.m4: New file, from gettext-0.15.
- * nls.m4: New file, from gettext-0.15.
- * po.m4: New file, from gettext-0.15.
- * printf-posix.m4: New file, from gettext-0.15.
- * progtest.m4: New file, from gettext-0.15.
- * signed.m4: New file, from gettext-0.15.
- * size_max.m4: New file, from gettext-0.15.
- * stdint_h.m4: New file, from gettext-0.15.
- * uintmax_t.m4: New file, from gettext-0.15.
- * ulonglong.m4: New file, from gettext-0.15.
- * visibility.m4: New file, from gettext-0.15.
- * wchar_t.m4: New file, from gettext-0.15.
- * wint_t.m4: New file, from gettext-0.15.
- * xsize.m4: New file, from gettext-0.15.
- * Makefile.am (EXTRA_DIST): Add the new files.
-
-2002-06-12 gettextize <bug-gnu-gettext@xxxxxxx>
-
- * codeset.m4: New file, from gettext-0.11.2.
- * gettext.m4: New file, from gettext-0.11.2.
- * glibc21.m4: New file, from gettext-0.11.2.
- * iconv.m4: New file, from gettext-0.11.2.
- * isc-posix.m4: New file, from gettext-0.11.2.
- * lcmessage.m4: New file, from gettext-0.11.2.
- * lib-ld.m4: New file, from gettext-0.11.2.
- * lib-link.m4: New file, from gettext-0.11.2.
- * lib-prefix.m4: New file, from gettext-0.11.2.
- * progtest.m4: New file, from gettext-0.11.2.
- * Makefile.am (EXTRA_DIST): Add the new files.
-
-2002-06-12 gettextize <bug-gnu-gettext@xxxxxxx>
-
- * codeset.m4: New file, from gettext-0.11.2.
- * gettext.m4: New file, from gettext-0.11.2.
- * glibc21.m4: New file, from gettext-0.11.2.
- * iconv.m4: New file, from gettext-0.11.2.
- * isc-posix.m4: New file, from gettext-0.11.2.
- * lcmessage.m4: New file, from gettext-0.11.2.
- * lib-ld.m4: New file, from gettext-0.11.2.
- * lib-link.m4: New file, from gettext-0.11.2.
- * lib-prefix.m4: New file, from gettext-0.11.2.
- * progtest.m4: New file, from gettext-0.11.2.
- * Makefile.am: New file.
-
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index e46f999..4ae3413 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -184,23 +184,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
############################################################################
############################################################################
-# Check for X11 start
-#
-
-if test "$MINGW" = "no"
-then
- AC_PATH_X
- AC_PATH_XTRA
-
- X_EXTRA_LIBS="$X_EXTRA_LIBS"
- X_LDFLAGS="$X_LDFLAGS $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lX11 -lm"
-fi
-
-#
-# Check for X11 end
-############################################################################
-
-############################################################################
# Check for glib 2.4 start
#
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs