Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
391a73b8
Commit
391a73b8
authored
18 years ago
by
Danny Auble
Browse files
Options
Downloads
Patches
Plain Diff
remove glade from the compile of sview
parent
734a64c2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
auxdir/x_ac_gtk.m4
+15
-13
15 additions, 13 deletions
auxdir/x_ac_gtk.m4
with
15 additions
and
13 deletions
auxdir/x_ac_gtk.m4
+
15
−
13
View file @
391a73b8
...
@@ -24,14 +24,14 @@ AC_DEFUN([X_AC_GTK],
...
@@ -24,14 +24,14 @@ AC_DEFUN([X_AC_GTK],
ac_have_gtk="no"
ac_have_gtk="no"
fi
fi
### Check for libglade package
### Check for libglade package
(We don't need this right now so don't add it)
if test "$ac_have_gtk" == "yes"; then
#
if test "$ac_have_gtk" == "yes"; then
$HAVEPKGCONFIG --exists libglade-2.0
#
$HAVEPKGCONFIG --exists libglade-2.0
if ! test $? -eq 0 ; then
#
if ! test $? -eq 0 ; then
AC_MSG_WARN([*** libbglade-2.0 is not available.])
#
AC_MSG_WARN([*** libbglade-2.0 is not available.])
ac_have_gtk="no"
#
ac_have_gtk="no"
fi
#
fi
fi
#
fi
### Check for gtk2.6 package
### Check for gtk2.6 package
...
@@ -57,11 +57,13 @@ AC_DEFUN([X_AC_GTK],
...
@@ -57,11 +57,13 @@ AC_DEFUN([X_AC_GTK],
### Run a test program
### Run a test program
if test "$ac_have_gtk" == "yes" ; then
if test "$ac_have_gtk" == "yes" ; then
GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0 gthread-2.0`
# GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0 gthread-2.0`
GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0 gthread-2.0`
GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags gtk+-2.0 gthread-2.0`
if test ! -z "GLADE_STATIC" ; then
# GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0 gthread-2.0`
GTK2_LIBS=`echo $GTK2_LIBS | sed "s/-lglade-2.0/$GLADE_STATIC -lglade-2.0 $BDYNAMIC/g"`
GTK2_LIBS=`$HAVEPKGCONFIG --libs gtk+-2.0 gthread-2.0`
fi
# if test ! -z "GLADE_STATIC" ; then
# GTK2_LIBS=`echo $GTK2_LIBS | sed "s/-lglade-2.0/$GLADE_STATIC -lglade-2.0 $BDYNAMIC/g"`
# fi
save_CFLAGS="$CFLAGS"
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
save_LIBS="$LIBS"
CFLAGS="$GTK2_CFLAGS $save_CFLAGS"
CFLAGS="$GTK2_CFLAGS $save_CFLAGS"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment